Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/7.0-rc1] net7.0 + net6.0 workload multitargeting changes #74018

Merged
merged 46 commits into from
Aug 22, 2022
Merged

[release/7.0-rc1] net7.0 + net6.0 workload multitargeting changes #74018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
9a51d25
WIP
akoeplinger Aug 11, 2022
1dbf0c7
Update all the workload names to be net6 versions. This is needed in …
marcpopMSFT Aug 11, 2022
77aaee9
Add localization to net7 and correct localization for net6 to target …
marcpopMSFT Aug 11, 2022
45ecca2
Update to 6.0.9 which should be the next version of emsdk.
marcpopMSFT Aug 11, 2022
318b795
Update the net7 and net6 workloads to rename all sdk packs
marcpopMSFT Aug 12, 2022
5c6d14d
Use localize data from net7 project
akoeplinger Aug 12, 2022
fa7628f
Fix typo
akoeplinger Aug 15, 2022
64c94be
Fix typo
akoeplinger Aug 15, 2022
2644c2f
Update KnownRuntimePack mono versions without clearing them all
lewing Aug 15, 2022
3429497
Add net6.0 to description and fix up emscripten-net6 reference
lewing Aug 16, 2022
32e11b9
Fix emsdk version number
lewing Aug 17, 2022
d53636b
depend on microsoft-net-sdk-emscripten-net7
lewing Aug 17, 2022
7ad680e
Fix missing .net7 renames
lewing Aug 17, 2022
457fda2
Merge remote-tracking branch 'origin/release/7.0-rc1' into net7-workl…
radical Aug 18, 2022
0f59d8f
Update WorkloadManifest.targets.in
lewing Aug 18, 2022
a5c2ca0
Update workload manifest to fix names
radical Aug 18, 2022
a9f7809
Update the emscripten manifest dependencies
radical Aug 18, 2022
7007e37
Use full hash
radical Aug 18, 2022
98326e3
WIP: install workload combos for testing
radical Aug 18, 2022
a9b1ecb
Update Versions.props
lewing Aug 18, 2022
6537540
Update emsdk dependencies to `7.0.0-rc.1.22418.3`
radical Aug 18, 2022
f4dc51b
Update emscripten to 7.0.0-rc.1.22418.6, and 6.0.4
radical Aug 19, 2022
3242f9f
wip
radical Aug 19, 2022
b30a803
Fix conditions in WorkloadManifest.targets
radical Aug 19, 2022
0a67ff0
Fix up running WBT
radical Aug 19, 2022
39ac738
Fix build
radical Aug 19, 2022
3be47c6
Update WorkloadManifest.targets.in
lewing Aug 19, 2022
eefad56
Update WorkloadManifest.targets.in
lewing Aug 19, 2022
ed554fa
Fix dotnet path references for workload testing
radical Aug 19, 2022
92fbedd
InstallWorkloadFromArtifacts: don't delete the target path between di…
radical Aug 19, 2022
7989d69
Fix PackageVersionNet6=6.0.8
radical Aug 19, 2022
fd4d734
WorkloadManifest.targets: rename some properties to be internal, and …
radical Aug 19, 2022
d8f9ca1
More renames to fix builds
radical Aug 19, 2022
15ed8c6
Merge branch 'release/7.0-rc1' into net7-workload-changes
lewing Aug 19, 2022
f8da8d3
Update Versions.props
lewing Aug 19, 2022
ea8110e
Fix up a condition in WorkloadManifest.targets
radical Aug 19, 2022
b21269b
Work around the import troubles
lewing Aug 20, 2022
4ac41be
Work around the import troubles
lewing Aug 20, 2022
0fe3b9d
Revert broken version check
lewing Aug 20, 2022
72b3eea
Use BrowserWorkloadDisabled which will be set in both cases
lewing Aug 20, 2022
6a4f96c
Fix typos in WorkloadManifest.targets
radical Aug 20, 2022
f620a6d
Wasm.Build.Tests: Workaround a msbuild bug causing mysterious failures
radical Aug 20, 2022
4d0cc0d
Merge remote-tracking branch 'origin/net7-workload-changes' into lewi…
radical Aug 20, 2022
6630851
cleanup
radical Aug 20, 2022
3c7c2d6
Merge branch 'release/7.0-rc1' into net7-workload-changes
lewing Aug 21, 2022
769a0fd
Remove a bunch of stale logic from WBT
lewing Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/workflow/testing/testing-workloads.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Workloads based on packages in `artifacts` can be installed, and used for testing.

- This is done by installing a specified SDK version (`$(SdkVersionForWorkloadTesting)`) in `artifacts/bin/dotnet-workload`.
- This is done by installing a specified SDK version (`$(SdkVersionForWorkloadTesting)`) in `artifacts/bin/dotnet-net7`.
- Then the manifest for the workload in `@(WorkloadIdForTesting)` is installed
- Then workload packs are installed
- packs, or manifests not generated by `runtime`, are restored from nuget
Expand Down
100 changes: 52 additions & 48 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>dc012a715ceb9b5d5258f2fda77520586af5a36a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22411.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>216093204c415b6e37dfadfcbcf183881b443636</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
<Uri>https://github.com/dotnet/wcf</Uri>
<Sha>7f504aabb1988e9a093c1e74d8040bd52feb2f01</Sha>
Expand Down Expand Up @@ -52,6 +48,14 @@
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22418.6">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>eb3232eb90aac35a31134464fc498a5f1ddb239f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22418.4">
Expand Down Expand Up @@ -126,85 +130,85 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0c027eede69ba22bafca9a1955f1e00848655ece</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.Drawing.Common.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.Formats.Tar.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.IO.Compression.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.IO.Packaging.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.Runtime.TimeZoneData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.Text.RegularExpressions.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.Windows.Extensions.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.22409.1">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22412.3">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22415.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
<Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22412.3">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22415.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
<Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22412.3">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22415.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
<Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22412.3">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22415.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
<Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22412.3">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22415.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
<Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22412.3">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22415.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
<Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22412.3">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22415.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
<Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22412.3">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22415.2">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>33e2c0435810d0110785ef33e50432c4990f7bba</Sha>
<Sha>f049b5ff5955a8281c70d27ad45cbd87e9df1ab6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22414.6">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -270,13 +274,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.1.0-alpha.0.22408.2">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.1.0-alpha.0.22415.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>f82b82000caf3e7a9789e1425a0baa12fdc70d09</Sha>
<Sha>beb43eebb0bb4bd299d562cedd54714528962add</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.22409.1">
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.22415.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>77acd39a813579e1e9b12cd98466787e7f90e059</Sha>
<Sha>555080fde81d34b38dfab27115c52f0a620803a2</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22403.2">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
Expand Down
50 changes: 26 additions & 24 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<MinorVersion>0</MinorVersion>
<PatchVersion>0</PatchVersion>
<SdkBandVersion>7.0.100</SdkBandVersion>
<PackageVersionNet6>6.0.8</PackageVersionNet6>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<!-- Set assembly version to align with major and minor version,
Expand All @@ -21,6 +22,8 @@
<UsingToolXliff>false</UsingToolXliff>
<LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
<MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet6Manifest70100Version>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>7.0.0-rc.1.22418.6</MicrosoftNETWorkloadEmscriptennet7Manifest70100Version>
</PropertyGroup>
<!--
For source generator support we need to target multiple versions of Roslyn in order to be able to run on older versions of Roslyn.
Expand Down Expand Up @@ -119,19 +122,19 @@
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>7.0.0-rc.1.22414.6</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22409.1</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22409.1</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>7.0.0-beta.22409.1</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>7.0.0-beta.22409.1</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>7.0.0-beta.22409.1</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>7.0.0-beta.22409.1</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>7.0.0-beta.22409.1</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22409.1</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22409.1</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22409.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.22409.1</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22409.1</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22409.1</MicrosoftDotNetCilStripSourcesVersion>
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22415.3</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22415.3</SystemComponentModelTypeConverterTestDataVersion>
<SystemDrawingCommonTestDataVersion>7.0.0-beta.22415.3</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>7.0.0-beta.22415.3</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>7.0.0-beta.22415.3</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>7.0.0-beta.22415.3</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>7.0.0-beta.22415.3</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22415.3</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22415.3</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22415.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.22415.3</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22415.3</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22415.3</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand All @@ -157,7 +160,7 @@
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22411.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.1.0-alpha.0.22408.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.1.0-alpha.0.22415.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
Expand All @@ -181,17 +184,16 @@
<MicrosoftNativeQuicMsQuicVersion>2.1</MicrosoftNativeQuicMsQuicVersion>
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22406.1</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22412.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22412.3</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22412.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22412.3</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22412.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22412.3</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22412.3</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22412.3</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22415.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22415.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22415.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22415.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22415.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22415.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22415.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22415.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-rc.1.22411.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
<WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ steps:

- script: >-
mkdir -p $(Build.SourcesDirectory)/artifacts/staging &&
cp -r $(Build.SourcesDirectory)/artifacts/bin/dotnet-workload $(Build.SourcesDirectory)/artifacts/staging &&
cp -r $(Build.SourcesDirectory)/artifacts/bin/dotnet-net7 $(Build.SourcesDirectory)/artifacts/staging &&
cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.runtime.browser-wasm $(Build.SourcesDirectory)/artifacts/staging &&
cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.ref $(Build.SourcesDirectory)/artifacts/staging
displayName: "Prepare artifacts staging directory"
Expand Down
Loading