Skip to content

Commit bdde954

Browse files
ViktorHoferViktorHofer
authored
Merge branch 'main' into dev/Jason/mergeToMain
2 parents 9226941 + e5fc5f0 commit bdde954

File tree

11 files changed

+329
-326
lines changed

11 files changed

+329
-326
lines changed

‎eng/Version.Details.xml

Lines changed: 178 additions & 178 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 71 additions & 71 deletions
Large diffs are not rendered by default.

‎eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
${{ if ne(parameters.container.image, '') }}:
132132
container:
133133
image: ${{ parameters.container.image }}
134-
options: --privileged
134+
options: $(defaultContainerOptions)
135135

136136
# Currently, CodeQL slows the build down too much
137137
# https://github.com/dotnet/source-build/issues/4276

‎eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ variables:
1212
- name: VmrBranch
1313
value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }}
1414

15+
- name: defaultContainerOptions
16+
value: --privileged
17+
1518
- name: almaLinuxContainerName
1619
value: almaLinuxContainer
1720
- name: almaLinuxContainerImage

‎src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.InstallRecords.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,13 @@ protected List<WorkloadSetRecord> GetWorkloadSetRecords()
6969
"Microsoft.NET.Workload.Emscripten.Current",
7070
"Microsoft.NET.Workload.Emscripten.net6",
7171
"Microsoft.NET.Workload.Emscripten.net7",
72+
"Microsoft.NET.Workload.Emscripten.net8",
73+
"Microsoft.NET.Workload.Emscripten.net9",
7274
"Microsoft.NET.Workload.Mono.ToolChain.Current",
7375
"Microsoft.NET.Workload.Mono.ToolChain.net6",
7476
"Microsoft.NET.Workload.Mono.ToolChain.net7",
77+
"Microsoft.NET.Workload.Mono.ToolChain.net8",
78+
"Microsoft.NET.Workload.Mono.ToolChain.net9",
7579
];
7680

7781
private static readonly IReadOnlyDictionary<string, string> ManifestIdCasing = CasedManifestIds.ToDictionary(id => id.ToLowerInvariant()).AsReadOnly();

‎src/Installer/redist-installer/targets/BundledManifests.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
<BundledManifests Include="Microsoft.NET.Workload.Emscripten.net6" FeatureBand="$(EmscriptenWorkloadFeatureBand)" Version="$(EmscriptenWorkloadManifestVersion)" />
1414
<BundledManifests Include="Microsoft.NET.Workload.Emscripten.net7" FeatureBand="$(EmscriptenWorkloadFeatureBand)" Version="$(EmscriptenWorkloadManifestVersion)" />
1515
<BundledManifests Include="Microsoft.NET.Workload.Emscripten.net8" FeatureBand="$(EmscriptenWorkloadFeatureBand)" Version="$(EmscriptenWorkloadManifestVersion)" />
16+
<BundledManifests Include="Microsoft.NET.Workload.Emscripten.net9" FeatureBand="$(EmscriptenWorkloadFeatureBand)" Version="$(EmscriptenWorkloadManifestVersion)" />
1617
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net6" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
1718
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net7" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
1819
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net8" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
20+
<BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain.net9" FeatureBand="$(MonoWorkloadFeatureBand)" Version="$(MonoWorkloadManifestVersion)" />
1921
<BundledManifests Include="Microsoft.NET.Sdk.Aspire" FeatureBand="$(AspireFeatureBand)" Version="$(MicrosoftNETSdkAspireManifest80100PackageVersion)" />
2022
</ItemGroup>
2123

@@ -60,7 +62,7 @@
6062
<ItemGroup>
6163
<!-- Don't try to validate signing for workload manifests that will be signed as part of post-build signing -->
6264
<BundledManifestsToValidateSigning Include="@(BundledManifests)"
63-
Exclude="Microsoft.NET.Workload.Mono.ToolChain.Current;Microsoft.NET.Workload.Mono.ToolChain.net6;Microsoft.NET.Workload.Mono.ToolChain.net7;Microsoft.NET.Workload.Mono.ToolChain.net8;Microsoft.NET.Workload.Emscripten.Current;Microsoft.NET.Workload.Emscripten.net6;Microsoft.NET.Workload.Emscripten.net7;Microsoft.NET.Workload.Emscripten.net8;Microsoft.NET.Sdk.Aspire">
65+
Exclude="Microsoft.NET.Workload.Mono.ToolChain.Current;Microsoft.NET.Workload.Mono.ToolChain.net6;Microsoft.NET.Workload.Mono.ToolChain.net7;Microsoft.NET.Workload.Mono.ToolChain.net8;Microsoft.NET.Workload.Mono.ToolChain.net9;Microsoft.NET.Workload.Emscripten.Current;Microsoft.NET.Workload.Emscripten.net6;Microsoft.NET.Workload.Emscripten.net7;Microsoft.NET.Workload.Emscripten.net8;Microsoft.NET.Workload.Emscripten.net9;Microsoft.NET.Sdk.Aspire">
6466
<RestoredMsiPathInNupkg>$([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi'))))</RestoredMsiPathInNupkg>
6567
</BundledManifestsToValidateSigning>
6668

‎src/Layout/redist/targets/OverlaySdkOnLKG.targets

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,19 @@
6060

6161
<!-- If the stage 0 SDK doesn't have KnownWorkloadManifests.txt, then write a default version -->
6262
<WriteLinesToFile File="$(SdkOutputDirectory)\KnownWorkloadManifests.txt"
63-
Lines="microsoft.net.sdk.android;microsoft.net.sdk.aspire;microsoft.net.sdk.ios;microsoft.net.sdk.maccatalyst;microsoft.net.sdk.macos;microsoft.net.sdk.maui;microsoft.net.sdk.tvos;microsoft.net.workload.mono.toolchain.current;microsoft.net.workload.emscripten.current;microsoft.net.workload.emscripten.net6;microsoft.net.workload.emscripten.net7;microsoft.net.workload.emscripten.net8;microsoft.net.workload.mono.toolchain.net6;microsoft.net.workload.mono.toolchain.net7;microsoft.net.workload.mono.toolchain.net8"/>
63+
Lines="microsoft.net.sdk.android;microsoft.net.sdk.aspire;microsoft.net.sdk.ios;microsoft.net.sdk.maccatalyst;microsoft.net.sdk.macos;microsoft.net.sdk.maui;microsoft.net.sdk.tvos;microsoft.net.workload.mono.toolchain.current;microsoft.net.workload.emscripten.current;microsoft.net.workload.emscripten.net6;microsoft.net.workload.emscripten.net7;microsoft.net.workload.emscripten.net8;microsoft.net.workload.emscripten.net9;microsoft.net.workload.mono.toolchain.net6;microsoft.net.workload.mono.toolchain.net7;microsoft.net.workload.mono.toolchain.net8;microsoft.net.workload.mono.toolchain.net9"/>
6464

6565
<ItemGroup>
6666
<WasmWorkloads Include="microsoft.net.workload.mono.toolchain.current" Version="$(MonoWorkloadManifestVersion)/$(MonoWorkloadFeatureBand)"/>
6767
<WasmWorkloads Include="microsoft.net.workload.mono.toolchain.net6" Version="$(MonoWorkloadManifestVersion)/$(MonoWorkloadFeatureBand)"/>
6868
<WasmWorkloads Include="microsoft.net.workload.mono.toolchain.net7" Version="$(MonoWorkloadManifestVersion)/$(MonoWorkloadFeatureBand)"/>
6969
<WasmWorkloads Include="microsoft.net.workload.mono.toolchain.net8" Version="$(MonoWorkloadManifestVersion)/$(MonoWorkloadFeatureBand)"/>
70+
<WasmWorkloads Include="microsoft.net.workload.mono.toolchain.net9" Version="$(MonoWorkloadManifestVersion)/$(MonoWorkloadFeatureBand)"/>
7071
<WasmWorkloads Include="microsoft.net.workload.emscripten.current" Version="$(EmscriptenWorkloadManifestVersion)/$(EmscriptenWorkloadFeatureBand)"/>
71-
<WasmWorkloads Include="microsoft.net.workload.emscripten.net6" Version="$(EmscriptenWorkloadManifestVersion)/$(EmscriptenWorkloadFeatureBand)"/>
72-
<WasmWorkloads Include="microsoft.net.workload.emscripten.net7" Version="$(EmscriptenWorkloadManifestVersion)/$(EmscriptenWorkloadFeatureBand)"/>
72+
<WasmWorkloads Include="microsoft.net.workload.emscripten.net6" Version="$(EmscriptenWorkloadManifestVersion)/$(EmscriptenWorkloadFeatureBand)"/>
73+
<WasmWorkloads Include="microsoft.net.workload.emscripten.net7" Version="$(EmscriptenWorkloadManifestVersion)/$(EmscriptenWorkloadFeatureBand)"/>
7374
<WasmWorkloads Include="microsoft.net.workload.emscripten.net8" Version="$(EmscriptenWorkloadManifestVersion)/$(EmscriptenWorkloadFeatureBand)"/>
74-
75-
<WasmRuntimePackVersion Include="_RuntimePackInWorkloadVersion6" Version="$(_RuntimePackInWorkloadVersion6)" />
76-
<WasmRuntimePackVersion Include="_RuntimePackInWorkloadVersion7" Version="$(_RuntimePackInWorkloadVersion7)" />
75+
<WasmWorkloads Include="microsoft.net.workload.emscripten.net9" Version="$(EmscriptenWorkloadManifestVersion)/$(EmscriptenWorkloadFeatureBand)"/>
7776
</ItemGroup>
7877

7978
<!-- Create a rollback file for installing workloads during the build -->

‎src/SourceBuild/content/eng/pipelines/ci.yml

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variables:
4444
value: ${{ eq(variables['Build.Reason'], 'PullRequest') }}
4545

4646
- template: /eng/common/templates-official/variables/pool-providers.yml@self
47+
- template: /src/sdk/eng/pipelines/templates/variables/vmr-build.yml@self
4748

4849
resources:
4950
repositories:
@@ -78,57 +79,57 @@ extends:
7879
baselineFile: $(Build.SourcesDirectory)\.config\guardian\.gdnbaselines
7980

8081
containers:
81-
almaLinuxContainer:
82-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
83-
options: --privileged
84-
alpineLatestContainer:
85-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64
86-
options: --privileged
87-
alpinePreviousContainer:
88-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
89-
options: --privileged
90-
centOSStreamContainer:
91-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
92-
options: --privileged
93-
fedoraContainer:
94-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41
95-
options: --privileged
96-
ubuntuContainer:
97-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04
98-
options: --privileged
99-
ubuntuArmContainer:
100-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-arm64
101-
options: --privileged
102-
azurelinuxX64CrossContainer:
103-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64
104-
options: --privileged
105-
azurelinuxArmCrossContainer:
106-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm
107-
options: --privileged
108-
azurelinuxArm64CrossContainer:
109-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64
110-
options: --privileged
111-
azurelinuxX64AlpineCrossContainer:
112-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-amd64-alpine
113-
options: --privileged
114-
azurelinuxArmAlpineCrossContainer:
115-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm-alpine
116-
options: --privileged
117-
azurelinuxArm64AlpineCrossContainer:
118-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-arm64-alpine
119-
options: --privileged
120-
androidCrossContainer:
121-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-cross-android-amd64
122-
options: --privileged
123-
linuxBionicCrossContainer:
124-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-android-openssl
125-
options: --privileged
126-
browserCrossContainer:
127-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64
128-
options: --privileged
129-
wasiCrossContainer:
130-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net9.0-webassembly-amd64
131-
options: --privileged
82+
${{ variables.almaLinuxContainerName }}:
83+
image: ${{ variables.almaLinuxContainerImage }}
84+
options: ${{ variables.defaultContainerOptions }}
85+
${{ variables.alpineLatestContainerName }}:
86+
image: ${{ variables.alpineLatestContainerImage }}
87+
options: ${{ variables.defaultContainerOptions }}
88+
${{ variables.alpinePreviousContainerName }}:
89+
image: ${{ variables.alpinePreviousContainerImage }}
90+
options: ${{ variables.defaultContainerOptions }}
91+
${{ variables.centOSStreamContainerName }}:
92+
image: ${{ variables.centOSStreamContainerImage }}
93+
options: ${{ variables.defaultContainerOptions }}
94+
${{ variables.fedoraContainerName }}:
95+
image: ${{ variables.fedoraContainerImage }}
96+
options: ${{ variables.defaultContainerOptions }}
97+
${{ variables.ubuntuContainerName }}:
98+
image: ${{ variables.ubuntuContainerImage }}
99+
options: ${{ variables.defaultContainerOptions }}
100+
${{ variables.ubuntuArmContainerName }}:
101+
image: ${{ variables.ubuntuArmContainerImage }}
102+
options: ${{ variables.defaultContainerOptions }}
103+
${{ variables.azurelinuxX64CrossContainerName }}:
104+
image: ${{ variables.azurelinuxX64CrossContainerImage }}
105+
options: ${{ variables.defaultContainerOptions }}
106+
${{ variables.azurelinuxArmCrossContainerName }}:
107+
image: ${{ variables.azurelinuxArmCrossContainerImage }}
108+
options: ${{ variables.defaultContainerOptions }}
109+
${{ variables.azurelinuxArm64CrossContainerName }}:
110+
image: ${{ variables.azurelinuxArm64CrossContainerImage }}
111+
options: ${{ variables.defaultContainerOptions }}
112+
${{ variables.azurelinuxX64AlpineCrossContainerName }}:
113+
image: ${{ variables.azurelinuxX64AlpineCrossContainerImage }}
114+
options: ${{ variables.defaultContainerOptions }}
115+
${{ variables.azurelinuxArmAlpineCrossContainerName }}:
116+
image: ${{ variables.azurelinuxArmAlpineCrossContainerImage }}
117+
options: ${{ variables.defaultContainerOptions }}
118+
${{ variables.azurelinuxArm64AlpineCrossContainerName }}:
119+
image: ${{ variables.azurelinuxArm64AlpineCrossContainerImage }}
120+
options: ${{ variables.defaultContainerOptions }}
121+
${{ variables.androidCrossContainerName }}:
122+
image: ${{ variables.androidCrossContainerImage }}
123+
options: ${{ variables.defaultContainerOptions }}
124+
${{ variables.linuxBionicCrossContainerName }}:
125+
image: ${{ variables.linuxBionicCrossContainerImage }}
126+
options: ${{ variables.defaultContainerOptions }}
127+
${{ variables.browserCrossContainerName }}:
128+
image: ${{ variables.browserCrossContainerImage }}
129+
options: ${{ variables.defaultContainerOptions }}
130+
${{ variables.wasiCrossContainerName }}:
131+
image: ${{ variables.wasiCrossContainerImage }}
132+
options: ${{ variables.defaultContainerOptions }}
132133

133134
stages:
134135
- ${{ if and(ne(variables.isPRTrigger, 'true'), eq(variables['System.TeamProject'], 'internal')) }}:

‎src/Tasks/Microsoft.NET.Build.Tasks/ShowMissingWorkloads.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class ShowMissingWorkloads : TaskBase
1919
{ "android", "android-aot", "ios", "maccatalyst", "macos", "maui", "maui-android",
2020
"maui-desktop", "maui-ios", "maui-maccatalyst", "maui-mobile", "maui-windows", "tvos" };
2121
private static readonly HashSet<string> WasmWorkloadIds = new(StringComparer.OrdinalIgnoreCase)
22-
{ "wasm-tools", "wasm-tools-net6", "wasm-tools-net7" };
22+
{ "wasm-tools", "wasm-tools-net6", "wasm-tools-net7", "wasm-tools-net8", "wasm-tools-net9" };
2323

2424
public ITaskItem[] MissingWorkloadPacks { get; set; }
2525

‎test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -855,11 +855,11 @@ static void Main(string[] args)
855855
.Should()
856856
.Pass();
857857

858-
var result = new DotnetCommand(Log, "run")
859-
.WithWorkingDirectory(Path.Combine(testAsset.Path, testProject.Name))
860-
.Execute();
858+
var exePath = Path.Combine(buildCommand.GetOutputDirectory(testProject.TargetFrameworks).FullName, testProject.Name + ".dll");
859+
860+
var result = new DotnetCommand(Log, "exec", exePath).Execute();
861861
result.Should().Pass();
862-
result.StdOut.StripTerminalLoggerProgressIndicators().Should().BeEquivalentTo(expectedFrameworkDisplayName);
862+
result.StdOut.Should().BeEquivalentTo(expectedFrameworkDisplayName);
863863
}
864864
}
865865
}

0 commit comments

Comments
 (0)