Skip to content

Commit 04d61ca

Browse files
joeloffjoeloff
authored
[release/7.0] Port workload fixes from 6.0 (#75486)
* Port workload fixes from 6.0 * Fix workload resource items
1 parent a6a2c38 commit 04d61ca

19 files changed

+188
-97
lines changed

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -58,77 +58,77 @@
5858
</Dependency>
5959
</ProductDependencies>
6060
<ToolsetDependencies>
61-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
61+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22457.4">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
63+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22418.4">
65+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22457.4">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
67+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22418.4">
69+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22457.4">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
71+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22418.4">
73+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22457.4">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
75+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22418.4">
77+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22457.4">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
79+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22418.4">
81+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22457.4">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
83+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22418.4">
85+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22457.4">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
87+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22418.4">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22457.4">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
91+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22418.4">
93+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22457.4">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
95+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22418.4">
97+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22457.4">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
99+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22418.4">
101+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22457.4">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
103+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22418.4">
105+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22457.4">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
107+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22418.4">
109+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22457.4">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
111+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22418.4">
113+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22457.4">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
115+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22418.4">
117+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22457.4">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
119+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22418.4">
121+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22457.4">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
123+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22418.4">
125+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22457.4">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
127+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22418.4">
129+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22457.4">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
131+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
132132
</Dependency>
133133
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22456.1">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -254,9 +254,9 @@
254254
<Uri>https://github.com/dotnet/xharness</Uri>
255255
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
256256
</Dependency>
257-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22418.4">
257+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22457.4">
258258
<Uri>https://github.com/dotnet/arcade</Uri>
259-
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
259+
<Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
260260
</Dependency>
261261
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
262262
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,22 @@
5757
<!-- SDK dependencies -->
5858
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
5959
<!-- Arcade dependencies -->
60-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22418.4</MicrosoftDotNetApiCompatVersion>
61-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksFeedVersion>
62-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22418.4</MicrosoftDotNetCodeAnalysisVersion>
63-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenAPIVersion>
64-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22418.4</MicrosoftDotNetGenFacadesVersion>
65-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22418.4</MicrosoftDotNetXUnitExtensionsVersion>
66-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22418.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
67-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksArchivesVersion>
68-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksInstallersVersion>
69-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksPackagingVersion>
70-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
71-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksTemplatingVersion>
72-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22418.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
73-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22418.4</MicrosoftDotNetRemoteExecutorVersion>
74-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22418.4</MicrosoftDotNetVersionToolsTasksVersion>
75-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22418.4</MicrosoftDotNetPackageTestingVersion>
60+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22457.4</MicrosoftDotNetApiCompatVersion>
61+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22457.4</MicrosoftDotNetBuildTasksFeedVersion>
62+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22457.4</MicrosoftDotNetCodeAnalysisVersion>
63+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22457.4</MicrosoftDotNetGenAPIVersion>
64+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22457.4</MicrosoftDotNetGenFacadesVersion>
65+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22457.4</MicrosoftDotNetXUnitExtensionsVersion>
66+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22457.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
67+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22457.4</MicrosoftDotNetBuildTasksArchivesVersion>
68+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22457.4</MicrosoftDotNetBuildTasksInstallersVersion>
69+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22457.4</MicrosoftDotNetBuildTasksPackagingVersion>
70+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22457.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
71+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22457.4</MicrosoftDotNetBuildTasksTemplatingVersion>
72+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22457.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
73+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22457.4</MicrosoftDotNetRemoteExecutorVersion>
74+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22457.4</MicrosoftDotNetVersionToolsTasksVersion>
75+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22457.4</MicrosoftDotNetPackageTestingVersion>
7676
<!-- NuGet dependencies -->
7777
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7878
<!-- Installer dependencies -->

‎eng/common/cross/arm/sources.list.focal‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse

‎eng/common/cross/arm/sources.list.jammy‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse

‎eng/common/cross/arm64/sources.list.focal‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse

‎eng/common/cross/arm64/sources.list.jammy‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
2+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe
3+
4+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
5+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe
6+
7+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
8+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted
9+
10+
deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -186,32 +186,27 @@ while :; do
186186
__UbuntuArch=i386
187187
__UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
188188
;;
189-
lldb3.6)
190-
__LLDB_Package="lldb-3.6-dev"
191-
;;
192-
lldb3.8)
193-
__LLDB_Package="lldb-3.8-dev"
194-
;;
195-
lldb3.9)
196-
__LLDB_Package="liblldb-3.9-dev"
197-
;;
198-
lldb4.0)
199-
__LLDB_Package="liblldb-4.0-dev"
200-
;;
201-
lldb5.0)
202-
__LLDB_Package="liblldb-5.0-dev"
203-
;;
204-
lldb6.0)
205-
__LLDB_Package="liblldb-6.0-dev"
189+
lldb*)
190+
version="${lowerI/lldb/}"
191+
parts=(${version//./ })
192+
193+
# for versions > 6.0, lldb has dropped the minor version
194+
if [[ "${parts[0]}" -gt 6 ]]; then
195+
version="${parts[0]}"
196+
fi
197+
198+
__LLDB_Package="liblldb-${version}-dev"
206199
;;
207200
no-lldb)
208201
unset __LLDB_Package
209202
;;
210203
llvm*)
211-
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
204+
version="${lowerI/llvm/}"
212205
parts=(${version//./ })
213206
__LLVM_MajorVersion="${parts[0]}"
214207
__LLVM_MinorVersion="${parts[1]}"
208+
209+
# for versions > 6.0, llvm has dropped the minor version
215210
if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then
216211
__LLVM_MinorVersion=0;
217212
fi
@@ -231,6 +226,16 @@ while :; do
231226
__CodeName=bionic
232227
fi
233228
;;
229+
focal) # Ubuntu 20.04
230+
if [[ "$__CodeName" != "jessie" ]]; then
231+
__CodeName=focal
232+
fi
233+
;;
234+
jammy) # Ubuntu 22.04
235+
if [[ "$__CodeName" != "jessie" ]]; then
236+
__CodeName=jammy
237+
fi
238+
;;
234239
jessie) # Debian 8
235240
__CodeName=jessie
236241
__UbuntuRepo="http://ftp.debian.org/debian/"

‎eng/common/cross/x86/sources.list.focal‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ focal-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse

‎eng/common/cross/x86/sources.list.jammy‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse

‎eng/common/generate-locproject.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ $locJson = @{
6262
$outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
6363
$continue = $true
6464
foreach ($exclusion in $exclusions.Exclusions) {
65-
if ($outputPath.Contains($exclusion))
65+
if ($_.FullName.Contains($exclusion))
6666
{
6767
$continue = $false
6868
}
@@ -98,7 +98,7 @@ $locJson = @{
9898
$outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\"
9999
$continue = $true
100100
foreach ($exclusion in $exclusions.Exclusions) {
101-
if ($outputPath.Contains($exclusion))
101+
if ($_.FullName.Contains($exclusion))
102102
{
103103
$continue = $false
104104
}

0 commit comments

Comments
 (0)