mirror of
https://github.com/VSadov/Satori.git
synced 2025-06-09 09:34:49 +09:00
[release/7.0-rc1] net7.0 + net6.0 workload multitargeting changes (#74018)
* WIP
* Update all the workload names to be net6 versions. This is needed in 7 but NOT in 6.
Dotnet workload install wasm-tools-net6 should install a different set of components than wasm-tools
* Add localization to net7 and correct localization for net6 to target that workload
* Update to 6.0.9 which should be the next version of emsdk.
* Update the net7 and net6 workloads to rename all sdk packs
* Use localize data from net7 project
* Fix typo
* Fix typo
* Update KnownRuntimePack mono versions without clearing them all
* Add net6.0 to description and fix up emscripten-net6 reference
* Fix emsdk version number
* depend on microsoft-net-sdk-emscripten-net7
* Fix missing .net7 renames
* Update WorkloadManifest.targets.in
Don't use **FromWorkload** for pack versions because it doesn't understand the name aliasing we have to use with runtime packs
* Update workload manifest to fix names
* Update the emscripten manifest dependencies
* Use full hash
* WIP: install workload combos for testing
* Update Versions.props
Use Pacjjag6.0.8 packages for the moment because they should be in dotnet-public
* Update emsdk dependencies to `7.0.0-rc.1.22418.3`
* Update emscripten to 7.0.0-rc.1.22418.6, and 6.0.4
* wip
* Fix conditions in WorkloadManifest.targets
* Fix up running WBT
* Fix build
HACK: to work around an incorrect condition in emscripten's
WorkloadManifest.targets which causes emscripten packs not to get
imported.
* Update WorkloadManifest.targets.in
* Update WorkloadManifest.targets.in
* Fix dotnet path references for workload testing
* InstallWorkloadFromArtifacts: don't delete the target path between different requests, clean up before starting
* Fix PackageVersionNet6=6.0.8
* WorkloadManifest.targets: rename some properties to be internal, and versioned
* More renames to fix builds
* Update Versions.props
* Fix up a condition in WorkloadManifest.targets
* Work around the import troubles
* Work around the import troubles
* Revert broken version check
* Use BrowserWorkloadDisabled which will be set in both cases
* Fix typos in WorkloadManifest.targets
* Wasm.Build.Tests: Workaround a msbuild bug causing mysterious failures
When running a fresh build with `dotnet build`, the first one works
fine. But all the subsequent builds fail with no info in the logs at
all.
```
$ /workspaces/runtime/artifacts/bin/dotnet-net7/dotnet build
MSBuild version 17.4.0-preview-22413-01+f0a66ec43 for .NET
Build FAILED.
0 Warning(s)
0 Error(s)
```
And it seems to be related to msbuild nodes, so disable NodeReuse.
* cleanup
* Remove a bunch of stale logic from WBT
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Ankit Jain <radical@gmail.com>
This commit is contained in:
Larry Ewing
parent
37ddbefcaf
commit
754014e711
GPG key ID:
4AEE18F83AFDEB23
59 changed files with 1375 additions and 600 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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">
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
@ -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.
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ jobs:
|
|||
- script: >-
|
||||
mkdir -p $(librariesDownloadDir)/bin/wasm/wasm-data &&
|
||||
mkdir -p $(librariesDownloadDir)/bin/wasm/dotnet &&
|
||||
cp -r $(librariesDownloadDir)/BrowserWasm/staging/dotnet-workload/* $(librariesDownloadDir)/bin/wasm/dotnet &&
|
||||
cp -r $(librariesDownloadDir)/BrowserWasm/staging/dotnet-net7/* $(librariesDownloadDir)/bin/wasm/dotnet &&
|
||||
cp src/mono/wasm/test-main.js $(librariesDownloadDir)/bin/wasm/wasm-data/test-main.js &&
|
||||
find $(librariesDownloadDir)/bin/wasm -type d &&
|
||||
find $(librariesDownloadDir)/bin/wasm -type f -exec chmod 664 {} \;
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ jobs:
|
|||
# copy wasm packs if running on wasm
|
||||
- script: >-
|
||||
mkdir -p $(librariesDownloadDir)/bin/wasm/data &&
|
||||
cp -r $(librariesDownloadDir)/BrowserWasm/staging/dotnet-workload $(librariesDownloadDir)/bin/wasm &&
|
||||
cp -r $(librariesDownloadDir)/BrowserWasm/staging/dotnet-net7 $(librariesDownloadDir)/bin/wasm &&
|
||||
cp src/mono/wasm/test-main.js $(librariesDownloadDir)/bin/wasm/data/test-main.js &&
|
||||
find $(librariesDownloadDir)/bin/wasm -type f -exec chmod 664 {} \;
|
||||
displayName: "Create wasm directory (Linux)"
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
<_WasmStrictVersionMatch Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</_WasmStrictVersionMatch>
|
||||
<XUnitUseRandomizedTestOrderer Condition="'$(XUnitUseRandomizedTestOrderer)' == '' and '$(IsTestProject)' == 'true'">true</XUnitUseRandomizedTestOrderer>
|
||||
<_UseWasmSymbolicator Condition="'$(TestTrimming)' != 'true'">true</_UseWasmSymbolicator>
|
||||
<WasmIgnoreNet6WorkloadInstallErrors Condition="'$(WasmIgnoreNet6WorkloadInstallErrors)' == ''">true</WasmIgnoreNet6WorkloadInstallErrors>
|
||||
<WasmIgnoreNet6WorkloadInstallErrors Condition="'$(WasmIgnoreNet6WorkloadInstallErrors)' != 'true'">false</WasmIgnoreNet6WorkloadInstallErrors>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(EnableAggressiveTrimming)' == 'true'">
|
||||
|
|
@ -138,14 +140,24 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<WorkloadIdForTesting Include="wasm-tools"
|
||||
ManifestName="Microsoft.NET.Workload.Mono.ToolChain"
|
||||
<WorkloadIdForTesting Include="wasm-tools;wasm-experimental"
|
||||
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net7"
|
||||
Variant="net7"
|
||||
Version="$(PackageVersion)"
|
||||
VersionBand="$(SdkBandVersion)" />
|
||||
<WorkloadIdForTesting Include="wasm-experimental"
|
||||
ManifestName="Microsoft.NET.Workload.Mono.ToolChain"
|
||||
|
||||
<WorkloadIdForTesting Include="wasm-tools-net6"
|
||||
ManifestName="Microsoft.NET.Workload.Mono.ToolChain.net6"
|
||||
Variant="net6"
|
||||
Version="$(PackageVersion)"
|
||||
VersionBand="$(SdkBandVersion)" />
|
||||
VersionBand="$(SdkBandVersion)"
|
||||
IgnoreErrors="$(WasmIgnoreNet6WorkloadInstallErrors)"
|
||||
/>
|
||||
|
||||
<WorkloadCombinationsToInstall Include="net7" Variants="net7" />
|
||||
<WorkloadCombinationsToInstall Include="net6" Variants="net6" />
|
||||
<WorkloadCombinationsToInstall Include="net6+7" Variants="net6;net7" />
|
||||
<!--<WorkloadCombinationsToInstall Include="none" />-->
|
||||
|
||||
<WasmExtraFilesToDeploy Condition="'$(_UseWasmSymbolicator)' == 'true'" Include="$(MonoProjectRoot)wasm\data\wasm-symbol-patterns.txt" />
|
||||
<WasmExtraFilesToDeploy Condition="'$(_UseWasmSymbolicator)' == 'true'" Include="$(ArtifactsBinDir)WasmSymbolicator\$(Configuration)\$(NetCoreAppToolCurrent)\WasmSymbolicator.dll" />
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@
|
|||
<PropertyGroup Condition="'$(TestUsingWorkloads)' == 'true'">
|
||||
<!-- for non-ci builds, we install the sdk when tests are run -->
|
||||
<InstallWorkloadForTesting Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(ArchiveTests)' == 'true'">true</InstallWorkloadForTesting>
|
||||
|
||||
<_SdkForWorkloadTestingBasePath>$(ArtifactsBinDir)</_SdkForWorkloadTestingBasePath>
|
||||
<_SdkWithNoWorkloadPath>$([MSBuild]::NormalizeDirectory($(_SdkForWorkloadTestingBasePath), 'dotnet-none'))</_SdkWithNoWorkloadPath>
|
||||
<_SdkWithNoWorkloadStampPath>$([MSBuild]::NormalizePath($(_SdkWithNoWorkloadPath), '.version-$(SdkVersionForWorkloadTesting).stamp'))</_SdkWithNoWorkloadStampPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -12,43 +16,21 @@
|
|||
<_DefaultPropsForNuGetBuild Include="ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="ProvisionSdkForWorkloadTesting"
|
||||
DependsOnTargets="_ProvisionSdkWithNoWorkload"
|
||||
Condition="!Exists($(SdkWithNoWorkloadStampPath)) or !Exists($(SdkWithWorkloadStampPath))">
|
||||
<Target Name="_ProvisionDotNetForWorkloadTesting" Condition="!Exists($(_SdkWithNoWorkloadStampPath))">
|
||||
<Error Text="%24(_SdkWithNoWorkloadPath) is not set" Condition="'$(_SdkWithNoWorkloadPath)' == ''" />
|
||||
|
||||
<Error Text="%24(SdkWithWorkloadForTestingPath) is not set" Condition="'$(SdkWithWorkloadForTestingPath)' == ''" />
|
||||
|
||||
<Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(SdkWithWorkloadForTestingPath)"
|
||||
<Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(_SdkWithNoWorkloadPath)"
|
||||
Condition="'$(SdkVersionForWorkloadTesting)' != ''"
|
||||
Importance="High" />
|
||||
<Message Text="** Installing latest sdk for workload based tests into $(SdkWithWorkloadForTestingPath)"
|
||||
<Message Text="** Installing latest sdk for workload based tests into $(_SdkWithNoWorkloadPath)"
|
||||
Condition="'$(SdkVersionForWorkloadTesting)' == ''"
|
||||
Importance="High" />
|
||||
|
||||
<RemoveDir Directories="$(SdkWithWorkloadForTestingPath)" />
|
||||
<MakeDir Directories="$(SdkWithWorkloadForTestingPath)" />
|
||||
|
||||
<ItemGroup>
|
||||
<_SourceFiles Include="$(SdkWithNoWorkloadForTestingPath)\**" />
|
||||
<_SdkWithNoWorkloadTarget Include="none" InstallPath="$(_SdkWithNoWorkloadPath)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Copy SourceFiles="@(_SourceFiles)" DestinationFolder="$(SdkWithWorkloadForTestingPath)\%(_SourceFiles.RecursiveDir)" />
|
||||
|
||||
<WriteLinesToFile File="$(SdkWithWorkloadStampPath)" Lines="" Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="_ProvisionSdkWithNoWorkload" Condition="!Exists($(SdkWithNoWorkloadStampPath))">
|
||||
<Error Text="%24(SdkWithNoWorkloadForTestingPath) is not set" Condition="'$(SdkWithNoWorkloadForTestingPath)' == ''" />
|
||||
|
||||
<Message Text="** Installing sdk $(SdkVersionForWorkloadTesting) for workload based tests into $(SdkWithNoWorkloadForTestingPath)"
|
||||
Condition="'$(SdkVersionForWorkloadTesting)' != ''"
|
||||
Importance="High" />
|
||||
<Message Text="** Installing latest sdk for workload based tests into $(SdkWithNoWorkloadForTestingPath)"
|
||||
Condition="'$(SdkVersionForWorkloadTesting)' == ''"
|
||||
Importance="High" />
|
||||
|
||||
<RemoveDir Directories="$(SdkWithNoWorkloadForTestingPath)" />
|
||||
<MakeDir Directories="$(SdkWithNoWorkloadForTestingPath)" />
|
||||
<RemoveDir Directories="$(_SdkWithNoWorkloadPath)" />
|
||||
<MakeDir Directories="$(_SdkWithNoWorkloadPath)" />
|
||||
|
||||
<PropertyGroup>
|
||||
<_DotNetInstallScriptName Condition="!$([MSBuild]::IsOSPlatform('windows'))">dotnet-install.sh</_DotNetInstallScriptName>
|
||||
|
|
@ -59,16 +41,16 @@
|
|||
|
||||
<PropertyGroup Condition="'$(SdkVersionForWorkloadTesting)' != ''">
|
||||
<_DotNetInstallCommand Condition="!$([MSBuild]::IsOSPlatform('windows'))"
|
||||
>$(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand>
|
||||
>$(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand>
|
||||
<_DotNetInstallCommand Condition="$([MSBuild]::IsOSPlatform('windows'))"
|
||||
>$(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Version $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand>
|
||||
>$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Version $(SdkVersionForWorkloadTesting)</_DotNetInstallCommand>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(SdkVersionForWorkloadTesting)' == ''">
|
||||
<_DotNetInstallCommand Condition="!$([MSBuild]::IsOSPlatform('windows'))"
|
||||
>$(_DotNetInstallScriptPath) -i $(SdkWithNoWorkloadForTestingPath) -v latest -q daily --channel 7.0</_DotNetInstallCommand>
|
||||
>$(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v latest -q daily --channel 7.0</_DotNetInstallCommand>
|
||||
<_DotNetInstallCommand Condition="$([MSBuild]::IsOSPlatform('windows'))"
|
||||
>$(_DotNetInstallScriptPath) -InstallDir $(SdkWithNoWorkloadForTestingPath) -Quality daily -Channel 7.0</_DotNetInstallCommand>
|
||||
>$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Quality daily -Channel 7.0</_DotNetInstallCommand>
|
||||
</PropertyGroup>
|
||||
|
||||
<DownloadFile SourceUrl="https://dot.net/v1/$(_DotNetInstallScriptName)"
|
||||
|
|
@ -82,13 +64,17 @@
|
|||
|
||||
<Exec Condition="$([MSBuild]::IsOSPlatform('windows'))"
|
||||
Command='powershell -ExecutionPolicy ByPass -NoProfile -command "& $(_DotNetInstallCommand)"' />
|
||||
|
||||
<WriteLinesToFile File="$(SdkWithNoWorkloadStampPath)" Lines="" Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="GetWorkloadInputs">
|
||||
<ItemGroup>
|
||||
<AvailableNuGetsInArtifacts Include="$(LibrariesShippingPackagesDir)\*.nupkg" />
|
||||
|
||||
<!--<_SdkWithWorkloadToInstall Include="none" Version="none" />-->
|
||||
<_SdkWithWorkloadToInstall Include="@(WorkloadCombinationsToInstall)" />
|
||||
<_SdkWithWorkloadToInstall InstallPath="$(_SdkForWorkloadTestingBasePath)\dotnet-%(Identity)" />
|
||||
<!--<_SdkWithWorkloadToInstall StampPath="%(InstallPath)\version-%(Version).stamp" Condition="'%(Version)' != ''" />-->
|
||||
<_SdkWithWorkloadToInstall StampPath="%(InstallPath)\version.stamp" />
|
||||
</ItemGroup>
|
||||
|
||||
<Error Text="Cannot find any nupkg files in $(LibrariesShippingPackagesDir), needed for workloads" Condition="@(AvailableNuGetsInArtifacts->Count()) == 0" />
|
||||
|
|
@ -104,7 +90,7 @@
|
|||
|
||||
<Target Name="InstallWorkloadUsingArtifacts"
|
||||
AfterTargets="ArchiveTests"
|
||||
DependsOnTargets="_GetNuGetsToBuild;_PreparePackagesForWorkloadInstall;ProvisionSdkForWorkloadTesting;GetWorkloadInputs;_InstallWorkload;_UpdateManifestsForSdkWithNoWorkload"
|
||||
DependsOnTargets="_GetNuGetsToBuild;_PreparePackagesForWorkloadInstall;GetWorkloadInputs;_ProvisionDotNetForWorkloadTesting;_InstallWorkloads"
|
||||
Condition="'$(InstallWorkloadForTesting)' == 'true'" />
|
||||
|
||||
<Target Name="_GetNuGetsToBuild" Returns="@(_NuGetsToBuild)" DependsOnTargets="_GetRuntimePackNuGetsToBuild">
|
||||
|
|
@ -168,7 +154,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<Error Condition="@(_RuntimePackNugetAvailable -> Count()) != 3 and @(_RuntimePackNugetAvailable -> Count()) != 1"
|
||||
Text="Multiple runtime pack nugets found. Expected to find either one or three in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" />
|
||||
Text="Expected to find either one or three in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" />
|
||||
|
||||
<ItemGroup>
|
||||
<_BuildVariants Include="multithread" Condition="'$(_DefaultBuildVariant)' != '.multithread.'" />
|
||||
|
|
@ -202,42 +188,22 @@
|
|||
*******************" />
|
||||
</Target>
|
||||
|
||||
<Target Name="_InstallWorkload"
|
||||
<Target Name="_InstallWorkloads"
|
||||
Inputs="@(AvailableNuGetsInArtifacts)"
|
||||
Outputs="$(SdkWithWorkload_WorkloadStampPath)">
|
||||
Outputs="@(_SdkWithWorkloadToInstall->'%(StampPath)')">
|
||||
<ItemGroup>
|
||||
<_BuiltNuGets Include="$(LibrariesShippingPackagesDir)\*.nupkg" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
</PropertyGroup>
|
||||
|
||||
<Error Text="Could not find cross compiler nupkg at $(_AOTCrossNuGetPath). Found packages: @(_BuiltNuGets)"
|
||||
Condition="!Exists($(_AOTCrossNuGetPath))" />
|
||||
|
||||
<Message Text="Packages found in $(LibrariesShippingPackagesDir): @(_BuiltNuGets)" Importance="Low" />
|
||||
|
||||
<InstallWorkloadFromArtifacts
|
||||
WorkloadIds="@(WorkloadIdForTesting)"
|
||||
InstallTargets="@(_SdkWithWorkloadToInstall)"
|
||||
VersionBand="$(SdkBandVersion)"
|
||||
LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
|
||||
TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
|
||||
SdkDir="$(SdkWithWorkloadForTestingPath)" />
|
||||
<WriteLinesToFile File="$(SdkWithWorkload_WorkloadStampPath)" Lines="" Overwrite="true" />
|
||||
</Target>
|
||||
|
||||
<Target Name="_UpdateManifestsForSdkWithNoWorkload"
|
||||
Inputs="@(AvailableNuGetsInArtifacts)"
|
||||
Outputs="$(SdkWithNoWorkload_WorkloadStampPath)">
|
||||
|
||||
<InstallWorkloadFromArtifacts
|
||||
WorkloadIds="@(WorkloadIdForTesting)"
|
||||
VersionBand="$(SdkBandVersion)"
|
||||
LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
|
||||
TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
|
||||
SdkDir="$(SdkWithNoWorkloadForTestingPath)"
|
||||
OnlyUpdateManifests="true"/>
|
||||
|
||||
<WriteLinesToFile File="$(SdkWithNoWorkload_WorkloadStampPath)" Lines="" Overwrite="true" />
|
||||
SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
|
||||
/>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -131,13 +131,13 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetsMobile)' == 'true'">
|
||||
<SdkWithNoWorkloadForTestingPath>$(ArtifactsBinDir)sdk-no-workload\</SdkWithNoWorkloadForTestingPath>
|
||||
<SdkWithNoWorkloadForTestingPath>$(ArtifactsBinDir)dotnet-none\</SdkWithNoWorkloadForTestingPath>
|
||||
<SdkWithNoWorkloadForTestingPath>$([MSBuild]::NormalizeDirectory($(SdkWithNoWorkloadForTestingPath)))</SdkWithNoWorkloadForTestingPath>
|
||||
|
||||
<SdkWithNoWorkloadStampPath>$(SdkWithNoWorkloadForTestingPath)version-$(SdkVersionForWorkloadTesting).stamp</SdkWithNoWorkloadStampPath>
|
||||
<SdkWithNoWorkload_WorkloadStampPath>$(SdkWithNoWorkloadForTestingPath)workload.stamp</SdkWithNoWorkload_WorkloadStampPath>
|
||||
|
||||
<SdkWithWorkloadForTestingPath>$(ArtifactsBinDir)dotnet-workload\</SdkWithWorkloadForTestingPath>
|
||||
<SdkWithWorkloadForTestingPath>$(ArtifactsBinDir)dotnet-net7\</SdkWithWorkloadForTestingPath>
|
||||
<SdkWithWorkloadForTestingPath>$([MSBuild]::NormalizeDirectory($(SdkWithWorkloadForTestingPath)))</SdkWithWorkloadForTestingPath>
|
||||
|
||||
<SdkWithWorkloadStampPath>$(SdkWithWorkloadForTestingPath)version-$(SdkVersionForWorkloadTesting).stamp</SdkWithWorkloadStampPath>
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@
|
|||
|
||||
<FailOnTestFailure Condition="'$(FailOnTestFailure)' == '' and '$(WaitForWorkItemCompletion)' != ''">$(WaitForWorkItemCompletion)</FailOnTestFailure>
|
||||
|
||||
<SdkForWorkloadTestingDirName Condition="'$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' == 'true'">dotnet-workload</SdkForWorkloadTestingDirName>
|
||||
<SdkForWorkloadTestingDirName Condition="'$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' != 'true'">sdk-no-workload</SdkForWorkloadTestingDirName>
|
||||
<SdkForWorkloadTestingDirName Condition="'$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' == 'true'">dotnet-net7</SdkForWorkloadTestingDirName>
|
||||
<SdkForWorkloadTestingDirName Condition="'$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' != 'true'">dotnet-none</SdkForWorkloadTestingDirName>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(HelixType)' == ''">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<WasmNativeWorkload>true</WasmNativeWorkload>
|
||||
<WasmNativeWorkload Condition="'$(WasmNativeWorkload)' == ''">net7.0</WasmNativeWorkload>
|
||||
<WasmNativeWorkload7>true</WasmNativeWorkload7>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,120 +0,0 @@
|
|||
<Project TreatAsLocalProperty="UsingBrowserRuntimeWorkload;WasmNativeWorkload">
|
||||
<PropertyGroup>
|
||||
<RuntimePackInWorkloadVersion>${PackageVersion}</RuntimePackInWorkloadVersion>
|
||||
<BrowserWorkloadDisabled Condition="'$(BrowserWorkloadDisabled)' == '' and
|
||||
'$(RuntimeIdentifier)' == 'browser-wasm' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
!$([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '6.0'))">true</BrowserWorkloadDisabled>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' AND '$(UsingBrowserRuntimeWorkload)' == ''">
|
||||
<!-- $(WasmBuildNative)==true is needed to enable workloads, when using native references, without AOT -->
|
||||
<UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(WasmBuildNative)' == 'true' or '$(WasmGenerateAppBundle)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)' != 'true'" >true</UsingBrowserRuntimeWorkload>
|
||||
<UsingBrowserRuntimeWorkload Condition="'$(UsingBrowserRuntimeWorkload)' == ''" >$(WasmNativeWorkload)</UsingBrowserRuntimeWorkload>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(BrowserWorkloadDisabled)' == 'true'">
|
||||
<UsingBrowserRuntimeWorkload>false</UsingBrowserRuntimeWorkload>
|
||||
<WasmNativeWorkload>false</WasmNativeWorkload>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
|
||||
<WasmGenerateAppBundle>false</WasmGenerateAppBundle>
|
||||
<UsingBlazorAOTWorkloadManifest>true</UsingBlazorAOTWorkloadManifest>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Condition="'$(RunAOTCompilation)' == 'true' and '$(BrowserWorkloadDisabled)' != 'true'" Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task" />
|
||||
|
||||
<ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'android'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'android' and '$(RunAOTCompilation)' == 'true'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'macOS'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'ios'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'ios' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'tvos'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetPlatformIdentifier)' == 'tvos' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk" />
|
||||
</ImportGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetPlatformIdentifier)' == 'android' or '$(TargetPlatformIdentifier)' == 'macOS' or '$(TargetPlatformIdentifier)' == 'ios' or '$(TargetPlatformIdentifier)' == 'maccatalyst' or '$(TargetPlatformIdentifier)' == 'tvos' or ('$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true')">
|
||||
<_MonoWorkloadTargetsMobile>true</_MonoWorkloadTargetsMobile>
|
||||
<_MonoWorkloadRuntimePackPackageVersion>$(RuntimePackInWorkloadVersion)</_MonoWorkloadRuntimePackPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(_MonoWorkloadTargetsMobile)' == 'true'">
|
||||
<KnownRuntimePack Update="@(KnownRuntimePack)">
|
||||
<LatestRuntimeFrameworkVersion Condition="'%(KnownRuntimePack.TargetFramework)' == '${NetCoreAppCurrent}' and '%(KnownRuntimePack.RuntimePackLabels)' == 'Mono'">**FromWorkload**</LatestRuntimeFrameworkVersion>
|
||||
<!-- Overrides for wasm threading support -->
|
||||
<RuntimePackNamePatterns Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(WasmEnableThreading)' == 'true'">Microsoft.NETCore.App.Runtime.Mono.multithread.**RID**</RuntimePackNamePatterns>
|
||||
<RuntimePackNamePatterns Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(WasmEnablePerfTrace)' == 'true'">Microsoft.NETCore.App.Runtime.Mono.perftrace.**RID**</RuntimePackNamePatterns>
|
||||
</KnownRuntimePack>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- we can't condition sdk imports on the item @(NativeFileReference). Instead, explicitly check before the build
|
||||
and emit a warning -->
|
||||
<Target Name="_CheckBrowserWorkloadNeededButNotAvailable"
|
||||
Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(BrowserWorkloadDisabled)' != 'true' and '$(WasmNativeWorkload)' != 'true'"
|
||||
BeforeTargets="Build">
|
||||
|
||||
<Warning Condition="@(NativeFileReference->Count()) > 0"
|
||||
Text="%40(NativeFileReference) is not empty, but the native references won't be linked in, because neither %24(WasmBuildNative), nor %24(RunAOTCompilation) are 'true'. NativeFileReference=@(NativeFileReference)" />
|
||||
</Target>
|
||||
|
||||
<Target Name="_ErrorDisabledWorkload" Condition="'$(BrowserWorkloadDisabled)' == 'true'" BeforeTargets="Build">
|
||||
<Error Condition="'$(RunAOTCompilation)' == 'true'"
|
||||
Text="WebAssembly workloads, required for AOT, are only supported for projects targeting net6.0+ . Set %24(RunAOTCompilation)=false to disable it." />
|
||||
|
||||
<Error Condition="@(NativeFileReference->Count()) > 0"
|
||||
Text="WebAssembly workloads, required for linking native files (from %40(NativeFileReference)), are only supported for projects targeting net6.0+ ." />
|
||||
</Target>
|
||||
|
||||
<Target Name="_ErrorDualWasmThreadProps"
|
||||
Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(BrowserWorkloadDisabled)' != 'true' and '$(WasmEnableThreading)' == 'true' and '$(WasmEnablePerfTrace)' == 'true'"
|
||||
BeforeTargets="Build">
|
||||
<Error Text="WebAssembly workloads can only support one active threading mode at a time. Either set WasmEnableThreading or WasmEnablePerfTrace to true, but not both." />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
<Project DefaultTargets="Build">
|
||||
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
|
||||
|
||||
<PropertyGroup>
|
||||
<PackageDescription>Internal toolchain package not meant for direct consumption. Please do not reference directly.</PackageDescription>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)">
|
||||
<!-- Override the id to include the sdk band as per the workload installer spec -->
|
||||
<PropertyGroup>
|
||||
<Id>Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(SdkBandVersion)</Id>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<WorkloadManifestPath>$(IntermediateOutputPath)WorkloadManifest.json</WorkloadManifestPath>
|
||||
<WorkloadManifestTargetsPath>$(IntermediateOutputPath)WorkloadManifest.targets</WorkloadManifestTargetsPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageFile Include="$(WorkloadManifestPath)" TargetPath="data" />
|
||||
<PackageFile Include="$(WorkloadManifestTargetsPath)" TargetPath="data" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<File Include="localize/**/*">
|
||||
<TargetPath>data/localize</TargetPath>
|
||||
</File>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Running this target ensures we have the fully evaluated PackageVersion -->
|
||||
<Target Name="_WriteManifestValues" AfterTargets="CalculatePackageVersion">
|
||||
<PropertyGroup>
|
||||
<PackagePathVersion>PackageVersion=$(PackageVersion);</PackagePathVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" />
|
||||
<_WorkloadManifestValues Include="PackageVersionNet6" Value="$(PackageVersionNet6)" />
|
||||
<_WorkloadManifestValues Include="EmscriptenVersion" Value="$(MicrosoftNETRuntimeEmscriptenVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<GenerateFileFromTemplate
|
||||
TemplateFile="WorkloadManifest.json.in"
|
||||
Properties="@(_WorkloadManifestValues)"
|
||||
OutputPath="$(WorkloadManifestPath)" />
|
||||
|
||||
<GenerateFileFromTemplate
|
||||
TemplateFile="WorkloadManifest.targets.in"
|
||||
Properties="@(_WorkloadManifestValues)"
|
||||
OutputPath="$(WorkloadManifestTargetsPath)" />
|
||||
</Target>
|
||||
|
||||
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,453 @@
|
|||
{
|
||||
"version": "${WorkloadVersion}",
|
||||
"depends-on": {
|
||||
"Microsoft.NET.Workload.Emscripten.net6": "${EmscriptenVersion}"
|
||||
},
|
||||
"workloads": {
|
||||
"wasm-tools-net6": {
|
||||
"description": ".NET WebAssembly build tools for net6.0",
|
||||
"packs": [
|
||||
"Microsoft.NET.Runtime.WebAssembly.Sdk.net6",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.browser-wasm",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.browser-wasm"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling-net6", "microsoft-net-sdk-emscripten-net6" ],
|
||||
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
|
||||
},
|
||||
"microsoft-net-runtime-android-net6": {
|
||||
"abstract": true,
|
||||
"description": "Android Mono Runtime",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.android-arm",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.android-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x86"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
|
||||
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
|
||||
},
|
||||
"microsoft-net-runtime-android-aot-net6": {
|
||||
"abstract": true,
|
||||
"description": "Android Mono AOT Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-android-net6" ],
|
||||
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
|
||||
},
|
||||
"microsoft-net-runtime-ios-net6": {
|
||||
"abstract": true,
|
||||
"description": "iOS Mono Runtime and AOT Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.ios-arm",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.ios-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-x64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-x86"
|
||||
],
|
||||
"extends": [ "runtimes-ios-net6" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
},
|
||||
"runtimes-ios-net6": {
|
||||
"abstract": true,
|
||||
"description": "iOS Mono Runtime Packs",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.ios-arm",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.ios-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x86"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
},
|
||||
"microsoft-net-runtime-maccatalyst-net6": {
|
||||
"abstract": true,
|
||||
"description": "MacCatalyst Mono Runtime and AOT Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-x64"
|
||||
],
|
||||
"extends": [ "runtimes-maccatalyst-net6" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
},
|
||||
"runtimes-maccatalyst-net6": {
|
||||
"abstract": true,
|
||||
"description": "MacCatalyst Mono Runtime Packs",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.maccatalyst-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.maccatalyst-x64"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
},
|
||||
"microsoft-net-runtime-macos-net6": {
|
||||
"abstract": true,
|
||||
"description": "MacOS CoreCLR and Mono Runtime Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-x64",
|
||||
"Microsoft.NETCore.App.Runtime.osx-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.osx-x64"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
|
||||
"platforms": [ "osx-arm64", "osx-x64" ]
|
||||
},
|
||||
"microsoft-net-runtime-tvos-net6": {
|
||||
"abstract": true,
|
||||
"description": "tvOS Mono Runtime and AOT Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvos-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvossimulator-x64"
|
||||
],
|
||||
"extends": [ "runtimes-tvos-net6" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
},
|
||||
"runtimes-tvos-net6": {
|
||||
"abstract": true,
|
||||
"description": "tvOS Mono Runtime Packs",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.tvos-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-x64"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling-net6" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
},
|
||||
"runtimes-windows-net6": {
|
||||
"description": "Windows Runtime Packs",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.net6.win-x64",
|
||||
"Microsoft.NETCore.App.Runtime.net6.win-x86",
|
||||
"Microsoft.NETCore.App.Runtime.net6.win-arm",
|
||||
"Microsoft.NETCore.App.Runtime.net6.win-arm64"
|
||||
]
|
||||
},
|
||||
"microsoft-net-runtime-mono-tooling-net6": {
|
||||
"abstract": true,
|
||||
"description": "Shared native build tooling for Mono runtime",
|
||||
"packs": [
|
||||
"Microsoft.NET.Runtime.MonoAOTCompiler.Task.net6",
|
||||
"Microsoft.NET.Runtime.MonoTargets.Sdk.net6"
|
||||
]
|
||||
}
|
||||
},
|
||||
"packs": {
|
||||
"Microsoft.NET.Runtime.MonoAOTCompiler.Task.net6": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NET.Runtime.MonoAOTCompiler.Task"
|
||||
}
|
||||
},
|
||||
"Microsoft.NET.Runtime.MonoTargets.Sdk.net6": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NET.Runtime.MonoTargets.Sdk"
|
||||
}
|
||||
},
|
||||
"Microsoft.NET.Runtime.WebAssembly.Sdk.net6": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NET.Runtime.WebAssembly.Sdk"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.android-arm": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.android-arm64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.android-x86": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x86": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x86",
|
||||
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x86",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-x64",
|
||||
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-x64",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm",
|
||||
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.android-arm64",
|
||||
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.android-arm64",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.maccatalyst-arm64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.maccatalyst-x64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-arm64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.osx-x64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.net6.osx-arm64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.net6.osx-x64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.osx-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.ios-arm" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.ios-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.iossimulator-x86" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvos-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.tvos-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.tvossimulator-x64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-x64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvossimulator-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvossimulator-x64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.ios-arm": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.ios-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-x64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-x86": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net6.browser-wasm": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm",
|
||||
"linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm",
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net6.browser-wasm" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.net6.win-x64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.win-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.net6.win-x86" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.win-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.net6.win-arm" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.win-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.net6.win-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersionNet6}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.win-arm64"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,136 @@
|
|||
<Project TreatAsLocalProperty="WasmNativeWorkload">
|
||||
<PropertyGroup>
|
||||
<_RuntimePackInWorkloadVersion6>${PackageVersionNet6}</_RuntimePackInWorkloadVersion6>
|
||||
<BrowserWorkloadDisabled Condition="'$(BrowserWorkloadDisabled)' == '' and
|
||||
'$(RuntimeIdentifier)' == 'browser-wasm' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
!$([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '6.0'))">true</BrowserWorkloadDisabled>
|
||||
<TargetsNet6 Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '6.0'))">true</TargetsNet6>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Make sure to set these properties only under TargetsNet* condition, as they are
|
||||
used outside the workload, but are set by more than one mono.toolchain manifests.
|
||||
|
||||
- UsingBrowserRuntimeWorkload
|
||||
- UsingBlazorAOTWorkloadManifest
|
||||
-->
|
||||
<PropertyGroup Condition="'$(TargetsNet6)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm'">
|
||||
<WasmNativeWorkload Condition="'$(WasmNativeWorkload)' != 'true'">false</WasmNativeWorkload>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetsNet6)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' AND '$(UsingBrowserRuntimeWorkload)' == ''">
|
||||
<!-- $(WasmBuildNative)==true is needed to enable workloads, when using native references, without AOT -->
|
||||
<UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(WasmBuildNative)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)' != 'true'" >true</UsingBrowserRuntimeWorkload>
|
||||
<UsingBrowserRuntimeWorkload Condition="'$(UsingBrowserRuntimeWorkload)' == ''" >$(WasmNativeWorkload)</UsingBrowserRuntimeWorkload>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetsNet6)' == 'true' and '$(BrowserWorkloadDisabled)' == 'true'">
|
||||
<UsingBrowserRuntimeWorkload>false</UsingBrowserRuntimeWorkload>
|
||||
<WasmNativeWorkload>false</WasmNativeWorkload>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetsNet6)' == 'true' and '$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
|
||||
<WasmGenerateAppBundle>false</WasmGenerateAppBundle>
|
||||
<UsingBlazorAOTWorkloadManifest>true</UsingBlazorAOTWorkloadManifest>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Condition="'$(TargetsNet6)' == 'true' and '$(RunAOTCompilation)' == 'true' and '$(BrowserWorkloadDisabled)' != 'true'" Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task.net6" />
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'android'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'android' and '$(RunAOTCompilation)' == 'true'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x86" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-x64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.android-arm64" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'macOS'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
</ImportGroup>
|
||||
<!--
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'macOS' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.osx-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.osx-x64" />
|
||||
</ImportGroup>
|
||||
-->
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'ios'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'ios' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.ios-arm" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.ios-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-x64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.iossimulator-x86" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'maccatalyst'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'maccatalyst' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.maccatalyst-x64" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'tvos'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(TargetPlatformIdentifier)' == 'tvos' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvos-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvossimulator-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.tvossimulator-x64" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet6)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk.net6" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net6.browser-wasm" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net6" />
|
||||
</ImportGroup>
|
||||
|
||||
<!-- HACK: -->
|
||||
<ImportGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '6.0'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python.net6" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node.net6" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk.net6" />
|
||||
</ImportGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetsNet6)' == 'true' and ('$(TargetPlatformIdentifier)' == 'android' or '$(TargetPlatformIdentifier)' == 'macOS' or '$(TargetPlatformIdentifier)' == 'ios' or '$(TargetPlatformIdentifier)' == 'maccatalyst' or '$(TargetPlatformIdentifier)' == 'tvos' or ('$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true'))">
|
||||
<_MonoWorkloadTargetsMobile>true</_MonoWorkloadTargetsMobile>
|
||||
<_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion6)</_MonoWorkloadRuntimePackPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetsNet6)' == 'true' and '$(_MonoWorkloadTargetsMobile)' == 'true'">
|
||||
<KnownRuntimePack Update="@(KnownRuntimePack)">
|
||||
<LatestRuntimeFrameworkVersion Condition="'%(KnownRuntimePack.TargetFramework)' == 'net6.0' and '%(KnownRuntimePack.RuntimePackLabels)' == 'Mono'">$(_MonoWorkloadRuntimePackPackageVersion)</LatestRuntimeFrameworkVersion>
|
||||
</KnownRuntimePack>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- we can't condition sdk imports on the item @(NativeFileReference). Instead, explicitly check before the build
|
||||
and emit a warning -->
|
||||
<Target Name="_CheckBrowserWorkloadNeededButNotAvailable"
|
||||
Condition="'$(TargetsNet6)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(BrowserWorkloadDisabled)' != 'true' and '$(WasmNativeWorkload)' != 'true'"
|
||||
BeforeTargets="Build">
|
||||
|
||||
<Warning Condition="@(NativeFileReference->Count()) > 0"
|
||||
Text="%40(NativeFileReference) is not empty, but the native references won't be linked in, because neither %24(WasmBuildNative), nor %24(RunAOTCompilation) are 'true'. NativeFileReference=@(NativeFileReference)" />
|
||||
</Target>
|
||||
|
||||
<!-- not checking TargetsNet7 here since this essentially checks for net5.0 -->
|
||||
<Target Name="_ErrorDisabledWorkload" Condition="'$(BrowserWorkloadDisabled)' == 'true'" BeforeTargets="Build">
|
||||
<Error Condition="'$(RunAOTCompilation)' == 'true'"
|
||||
Text="WebAssembly workloads, required for AOT, are only supported for projects targeting net6.0+ . Set %24(RunAOTCompilation)=false to disable it." />
|
||||
|
||||
<Error Condition="@(NativeFileReference->Count()) > 0"
|
||||
Text="WebAssembly workloads, required for linking native files (from %40(NativeFileReference)), are only supported for projects targeting net6.0+ ." />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": "Nástroje pro sestavení .NET WebAssembly"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": ".NET WebAssembly-Buildtools"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": ".NET WebAssembly build tools"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": "Herramientas de compilación de WebAssembly de .NET"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": "Outils de construction .NET WebAssembly"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": "Strumenti di compilazione WebAssembly .NET"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": ".NET WebAssembly ビルド ツール"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": ".NET WebAssembly 빌드 도구"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": "Narzędzia kompilacji zestawu WebAssembly platformy .NET"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": "Ferramentas de build do .NET WebAssembly"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": "Средства сборки WebAssembly .NET"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": ".NET WebAssembly derleme araçları"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": ".NET WebAssembly 生成工具"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"workloads/wasm-tools-net6/description": ".NET WebAssembly 組建工具"
|
||||
}
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
<Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)">
|
||||
<!-- Override the id to include the sdk band as per the workload installer spec -->
|
||||
<PropertyGroup>
|
||||
<Id>Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(SdkBandVersion)</Id>
|
||||
<Id>Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(SdkBandVersion)</Id>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -1,21 +1,21 @@
|
|||
{
|
||||
"version": "${WorkloadVersion}",
|
||||
"depends-on": {
|
||||
"Microsoft.NET.Workload.Emscripten": "${EmscriptenVersion}"
|
||||
"Microsoft.NET.Workload.Emscripten.net7": "${EmscriptenVersion}"
|
||||
},
|
||||
"workloads": {
|
||||
"wasm-tools": {
|
||||
"description": ".NET WebAssembly build tools",
|
||||
"packs": [
|
||||
"Microsoft.NET.Runtime.WebAssembly.Sdk",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.browser-wasm",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm"
|
||||
"Microsoft.NET.Runtime.WebAssembly.Sdk.net7",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.browser-wasm",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.browser-wasm"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten" ],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten-net7" ],
|
||||
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
|
||||
},
|
||||
"wasm-experimental": {
|
||||
"description": ".NET WebAssembly experimental",
|
||||
"description": ".NET WebAssembly experimental tooling",
|
||||
"packs": [
|
||||
"Microsoft.NET.Runtime.WebAssembly.Templates",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm",
|
||||
|
|
@ -28,10 +28,10 @@
|
|||
"abstract": true,
|
||||
"description": "Android Mono Runtime",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.android-arm",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.android-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.android-x64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.android-x86"
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.android-arm",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.android-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.android-x64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.android-x86"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling" ],
|
||||
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
|
||||
|
|
@ -40,10 +40,10 @@
|
|||
"abstract": true,
|
||||
"description": "Android Mono AOT Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64"
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-x86",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-x64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-arm",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-arm64"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-android" ],
|
||||
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
|
||||
|
|
@ -52,11 +52,11 @@
|
|||
"abstract": true,
|
||||
"description": "iOS Mono Runtime and AOT Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86"
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.ios-arm",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.ios-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.iossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.iossimulator-x64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.iossimulator-x86"
|
||||
],
|
||||
"extends": [ "runtimes-ios" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
|
|
@ -65,11 +65,11 @@
|
|||
"abstract": true,
|
||||
"description": "iOS Mono Runtime Packs",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.ios-arm",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.ios-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.ios-arm",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.ios-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.iossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.iossimulator-x64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.iossimulator-x86"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
|
|
@ -78,8 +78,8 @@
|
|||
"abstract": true,
|
||||
"description": "MacCatalyst Mono Runtime and AOT Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64"
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.maccatalyst-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.maccatalyst-x64"
|
||||
],
|
||||
"extends": [ "runtimes-maccatalyst" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
|
|
@ -88,8 +88,8 @@
|
|||
"abstract": true,
|
||||
"description": "MacCatalyst Mono Runtime Packs",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.maccatalyst-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.maccatalyst-x64"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
|
|
@ -98,8 +98,8 @@
|
|||
"abstract": true,
|
||||
"description": "MacOS CoreCLR and Mono Runtime Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.osx-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.osx-x64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.osx-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.osx-x64",
|
||||
"Microsoft.NETCore.App.Runtime.osx-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.osx-x64"
|
||||
],
|
||||
|
|
@ -110,9 +110,9 @@
|
|||
"abstract": true,
|
||||
"description": "tvOS Mono Runtime and AOT Workload",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64"
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.tvos-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.tvossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.tvossimulator-x64"
|
||||
],
|
||||
"extends": [ "runtimes-tvos" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
|
|
@ -121,9 +121,9 @@
|
|||
"abstract": true,
|
||||
"description": "tvOS Mono Runtime Packs",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.Mono.tvos-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.tvos-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.tvossimulator-arm64",
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.tvossimulator-x64"
|
||||
],
|
||||
"extends": [ "microsoft-net-runtime-mono-tooling" ],
|
||||
"platforms": [ "win-x64", "osx-arm64", "osx-x64" ]
|
||||
|
|
@ -131,55 +131,76 @@
|
|||
"runtimes-windows": {
|
||||
"description": "Windows Runtime Packs",
|
||||
"packs": [
|
||||
"Microsoft.NETCore.App.Runtime.win-x64",
|
||||
"Microsoft.NETCore.App.Runtime.win-x86",
|
||||
"Microsoft.NETCore.App.Runtime.win-arm",
|
||||
"Microsoft.NETCore.App.Runtime.win-arm64"
|
||||
"Microsoft.NETCore.App.Runtime.net7.win-x64",
|
||||
"Microsoft.NETCore.App.Runtime.net7.win-x86",
|
||||
"Microsoft.NETCore.App.Runtime.net7.win-arm",
|
||||
"Microsoft.NETCore.App.Runtime.net7.win-arm64"
|
||||
]
|
||||
},
|
||||
"microsoft-net-runtime-mono-tooling": {
|
||||
"abstract": true,
|
||||
"description": "Shared native build tooling for Mono runtime",
|
||||
"packs": [
|
||||
"Microsoft.NET.Runtime.MonoAOTCompiler.Task",
|
||||
"Microsoft.NET.Runtime.MonoTargets.Sdk",
|
||||
],
|
||||
"Microsoft.NET.Runtime.MonoAOTCompiler.Task.net7",
|
||||
"Microsoft.NET.Runtime.MonoTargets.Sdk.net7"
|
||||
]
|
||||
}
|
||||
},
|
||||
"packs": {
|
||||
"Microsoft.NET.Runtime.MonoAOTCompiler.Task": {
|
||||
"Microsoft.NET.Runtime.MonoAOTCompiler.Task.net7": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NET.Runtime.MonoAOTCompiler.Task"
|
||||
}
|
||||
},
|
||||
"Microsoft.NET.Runtime.MonoTargets.Sdk": {
|
||||
"Microsoft.NET.Runtime.MonoTargets.Sdk.net7": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NET.Runtime.MonoTargets.Sdk"
|
||||
}
|
||||
},
|
||||
"Microsoft.NET.Runtime.WebAssembly.Sdk": {
|
||||
"Microsoft.NET.Runtime.WebAssembly.Sdk.net7": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NET.Runtime.WebAssembly.Sdk"
|
||||
}
|
||||
},
|
||||
"Microsoft.NET.Runtime.WebAssembly.Templates": {
|
||||
"kind": "template",
|
||||
"version": "${PackageVersion}"
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.android-arm": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.android-arm": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.android-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.android-arm64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.android-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.android-x64": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.android-x64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.android-x86": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.android-x86": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.android-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x86": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-x86": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -189,7 +210,7 @@
|
|||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-x64": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-x64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -199,7 +220,7 @@
|
|||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-arm": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -209,7 +230,7 @@
|
|||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.android-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -219,71 +240,113 @@
|
|||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.maccatalyst-arm64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.maccatalyst-x64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.osx-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.osx-arm64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.osx-x64": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.osx-x64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.osx-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.net7.osx-arm64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.osx-x64": {
|
||||
"Microsoft.NETCore.App.Runtime.net7.osx-x64": {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.osx-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.ios-arm" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.ios-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64" : {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.ios-arm" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64" : {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.ios-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.ios-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86" : {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.iossimulator-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.iossimulator-x64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.iossimulator-x86" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.tvos-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.tvos-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64" : {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.tvos-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.tvos-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64" : {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.tvossimulator-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.tvossimulator-x64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.maccatalyst-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -291,7 +354,7 @@
|
|||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.maccatalyst-x64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -299,7 +362,7 @@
|
|||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.tvossimulator-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -307,7 +370,7 @@
|
|||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.tvossimulator-x64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -315,23 +378,23 @@
|
|||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.ios-arm": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.ios-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
|
||||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.iossimulator-arm64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -339,7 +402,7 @@
|
|||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.iossimulator-x64": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -347,7 +410,7 @@
|
|||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.iossimulator-x86": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -355,7 +418,7 @@
|
|||
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm": {
|
||||
"Microsoft.NETCore.App.Runtime.AOT.Cross.net7.browser-wasm": {
|
||||
"kind": "Sdk",
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
|
|
@ -365,9 +428,12 @@
|
|||
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.browser-wasm" : {
|
||||
"Microsoft.NETCore.App.Runtime.Mono.net7.browser-wasm" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm" : {
|
||||
"kind": "framework",
|
||||
|
|
@ -377,21 +443,33 @@
|
|||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.win-x64" : {
|
||||
"Microsoft.NETCore.App.Runtime.net7.win-x64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.win-x64"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.win-x86" : {
|
||||
"Microsoft.NETCore.App.Runtime.net7.win-x86" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.win-x86"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.win-arm" : {
|
||||
"Microsoft.NETCore.App.Runtime.net7.win-arm" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.win-arm"
|
||||
}
|
||||
},
|
||||
"Microsoft.NETCore.App.Runtime.win-arm64" : {
|
||||
"Microsoft.NETCore.App.Runtime.net7.win-arm64" : {
|
||||
"kind": "framework",
|
||||
"version": "${PackageVersion}"
|
||||
"version": "${PackageVersion}",
|
||||
"alias-to": {
|
||||
"any": "Microsoft.NETCore.App.Runtime.win-arm64"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,142 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<_RuntimePackInWorkloadVersion7>${PackageVersion}</_RuntimePackInWorkloadVersion7>
|
||||
<_BrowserWorkloadDisabled7>$(BrowserWorkloadDisabled)</_BrowserWorkloadDisabled7>
|
||||
<_BrowserWorkloadDisabled7 Condition="'$(_BrowserWorkloadDisabled7)' == '' and
|
||||
'$(RuntimeIdentifier)' == 'browser-wasm' and
|
||||
'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
|
||||
!$([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '7.0'))">true</_BrowserWorkloadDisabled7>
|
||||
<TargetsNet7 Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '7.0'))">true</TargetsNet7>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Make sure to set these properties only under TargetsNet* condition, as they are
|
||||
used outside the workload, but are set by more than one mono.toolchain manifests.
|
||||
|
||||
- UsingBrowserRuntimeWorkload
|
||||
- UsingBlazorAOTWorkloadManifest
|
||||
-->
|
||||
<PropertyGroup Condition="'$(TargetsNet7)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm'">
|
||||
<WasmNativeWorkload Condition="'$(WasmNativeWorkload7)' == 'true' and '$(WasmNativeWorkload)' != 'false'">true</WasmNativeWorkload>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetsNet7)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' AND '$(UsingBrowserRuntimeWorkload)' == ''">
|
||||
<!-- $(WasmBuildNative)==true is needed to enable workloads, when using native references, without AOT -->
|
||||
<UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(WasmBuildNative)' == 'true' or '$(WasmGenerateAppBundle)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)' != 'true'" >true</UsingBrowserRuntimeWorkload>
|
||||
<UsingBrowserRuntimeWorkload Condition="'$(UsingBrowserRuntimeWorkload)' == ''" >$(WasmNativeWorkload7)</UsingBrowserRuntimeWorkload>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetsNet7)' == 'true' and '$(_BrowserWorkloadDisabled7)' == 'true'">
|
||||
<UsingBrowserRuntimeWorkload>false</UsingBrowserRuntimeWorkload>
|
||||
<WasmNativeWorkload7>false</WasmNativeWorkload7>
|
||||
<WasmNativeWorkload>false</WasmNativeWorkload>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetsNet7)' == 'true' and '$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
|
||||
<WasmGenerateAppBundle>false</WasmGenerateAppBundle>
|
||||
<UsingBlazorAOTWorkloadManifest>true</UsingBlazorAOTWorkloadManifest>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Condition="'$(TargetsNet7)' == 'true' and '$(RunAOTCompilation)' == 'true' and '$(_BrowserWorkloadDisabled7)' != 'true'" Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task.net7" />
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(TargetPlatformIdentifier)' == 'android'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(TargetPlatformIdentifier)' == 'android' and '$(RunAOTCompilation)' == 'true'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-x86" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-x64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-arm" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.android-arm64" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(TargetPlatformIdentifier)' == 'macOS'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(TargetPlatformIdentifier)' == 'ios'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(TargetPlatformIdentifier)' == 'ios' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.ios-arm" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.ios-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.iossimulator-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.iossimulator-x64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.iossimulator-x86" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(TargetPlatformIdentifier)' == 'maccatalyst'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(TargetPlatformIdentifier)' == 'maccatalyst' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.maccatalyst-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.maccatalyst-x64" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(TargetPlatformIdentifier)' == 'tvos'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(TargetPlatformIdentifier)' == 'tvos' and $([MSBuild]::IsOSPlatform('osx'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.tvos-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.tvossimulator-arm64" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.tvossimulator-x64" />
|
||||
</ImportGroup>
|
||||
|
||||
<ImportGroup Condition="'$(TargetsNet7)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk.net7" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk.net7" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.net7.browser-wasm" />
|
||||
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.MonoTargets.Sdk.net7" />
|
||||
</ImportGroup>
|
||||
|
||||
<!-- HACK: -->
|
||||
<ImportGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '7.0'))">
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python.net7" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node.net7" />
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk.net7" />
|
||||
</ImportGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(TargetsNet7)' == 'true' and ('$(TargetPlatformIdentifier)' == 'android' or '$(TargetPlatformIdentifier)' == 'macOS' or '$(TargetPlatformIdentifier)' == 'ios' or '$(TargetPlatformIdentifier)' == 'maccatalyst' or '$(TargetPlatformIdentifier)' == 'tvos' or ('$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true'))">
|
||||
<_MonoWorkloadTargetsMobile>true</_MonoWorkloadTargetsMobile>
|
||||
<_MonoWorkloadRuntimePackPackageVersion>$(_RuntimePackInWorkloadVersion7)</_MonoWorkloadRuntimePackPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetsNet7)' == 'true' and '$(_MonoWorkloadTargetsMobile)' == 'true'">
|
||||
<KnownRuntimePack Update="@(KnownRuntimePack)">
|
||||
<LatestRuntimeFrameworkVersion Condition="'%(KnownRuntimePack.TargetFramework)' == 'net7.0' and '%(KnownRuntimePack.RuntimePackLabels)' == 'Mono'">$(_MonoWorkloadRuntimePackPackageVersion)</LatestRuntimeFrameworkVersion>
|
||||
<!-- Overrides for wasm threading support -->
|
||||
<RuntimePackNamePatterns Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(WasmEnableThreading)' == 'true'">Microsoft.NETCore.App.Runtime.Mono.multithread.**RID**</RuntimePackNamePatterns>
|
||||
<RuntimePackNamePatterns Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(WasmEnablePerfTrace)' == 'true'">Microsoft.NETCore.App.Runtime.Mono.perftrace.**RID**</RuntimePackNamePatterns>
|
||||
</KnownRuntimePack>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- we can't condition sdk imports on the item @(NativeFileReference). Instead, explicitly check before the build
|
||||
and emit a warning -->
|
||||
<Target Name="_CheckBrowserWorkloadNeededButNotAvailable"
|
||||
Condition="'$(TargetsNet7)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(_BrowserWorkloadDisabled7)' != 'true' and '$(WasmNativeWorkload7)' != 'true'"
|
||||
BeforeTargets="Build">
|
||||
|
||||
<Warning Condition="@(NativeFileReference->Count()) > 0"
|
||||
Text="%40(NativeFileReference) is not empty, but the native references won't be linked in, because neither %24(WasmBuildNative), nor %24(RunAOTCompilation) are 'true'. NativeFileReference=@(NativeFileReference)" />
|
||||
</Target>
|
||||
|
||||
<!-- not checking TargetsNet7 here since this essentially checks for net5.0 -->
|
||||
<Target Name="_ErrorDisabledWorkload" Condition="'$(BrowserWorkloadDisabled)' == 'true'" BeforeTargets="Build">
|
||||
<Error Condition="'$(RunAOTCompilation)' == 'true'"
|
||||
Text="WebAssembly workloads, required for AOT, are only supported for projects targeting net6.0+ . Set %24(RunAOTCompilation)=false to disable it." />
|
||||
|
||||
<Error Condition="@(NativeFileReference->Count()) > 0"
|
||||
Text="WebAssembly workloads, required for linking native files (from %40(NativeFileReference)), are only supported for projects targeting net6.0+ ." />
|
||||
</Target>
|
||||
|
||||
<Target Name="_ErrorDualWasmThreadProps"
|
||||
Condition="'$(TargetsNet7)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(_BrowserWorkloadDisabled7)' != 'true' and '$(WasmEnableThreading)' == 'true' and '$(WasmEnablePerfTrace)' == 'true'"
|
||||
BeforeTargets="Build">
|
||||
<Error Text="WebAssembly workloads can only support one active threading mode at a time. Either set WasmEnableThreading or WasmEnablePerfTrace to true, but not both." />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -15,7 +15,8 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetsMobile)' == 'true'">
|
||||
<ProjectReference Include="Microsoft.NET.Workload.Mono.Toolchain.Manifest\Microsoft.NET.Workload.Mono.Toolchain.Manifest.pkgproj" />
|
||||
<ProjectReference Include="Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest\Microsoft.NET.Workload.Mono.Toolchain.net6.Manifest.pkgproj" />
|
||||
<ProjectReference Include="Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest\Microsoft.NET.Workload.Mono.Toolchain.net7.Manifest.pkgproj" />
|
||||
<ProjectReference Include="Microsoft.NET.Runtime.MonoAOTCompiler.Task\Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -488,15 +488,11 @@ public class MonoAOTCompiler : Microsoft.Build.Utilities.Task
|
|||
{
|
||||
// compare original assembly vs it's outputs.. all it's outputs!
|
||||
string assemblyPath = args.AOTAssembly.GetMetadata("FullPath");
|
||||
if (args.ProxyFiles.Any(pf => IsNewerThanOutput(assemblyPath, pf.TargetFile)))
|
||||
if (args.ProxyFiles.Any(pf => Utils.IsNewerThan(assemblyPath, pf.TargetFile)))
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
static bool IsNewerThanOutput(string inFile, string outFile)
|
||||
=> !File.Exists(inFile) || !File.Exists(outFile) ||
|
||||
(File.GetLastWriteTimeUtc(inFile) > File.GetLastWriteTimeUtc(outFile));
|
||||
}
|
||||
|
||||
private IEnumerable<ITaskItem> FilterOutUnmanagedAssemblies(IEnumerable<ITaskItem> assemblies)
|
||||
|
|
|
|||
|
|
@ -23,6 +23,10 @@ internal static class Utils
|
|||
return reader.ReadToEnd();
|
||||
}
|
||||
|
||||
public static bool IsNewerThan(string inFile, string outFile)
|
||||
=> !File.Exists(inFile) || !File.Exists(outFile) ||
|
||||
(File.GetLastWriteTimeUtc(inFile) > File.GetLastWriteTimeUtc(outFile));
|
||||
|
||||
public static (int exitCode, string output) RunShellCommand(
|
||||
TaskLoggingHelper logger,
|
||||
string command,
|
||||
|
|
@ -233,6 +237,9 @@ internal static class Utils
|
|||
#if NETCOREAPP
|
||||
public static void DirectoryCopy(string sourceDir, string destDir, Func<string, bool>? predicate=null)
|
||||
{
|
||||
if (!Directory.Exists(destDir))
|
||||
Directory.CreateDirectory(destDir);
|
||||
|
||||
string[] files = Directory.GetFiles(sourceDir, "*", SearchOption.AllDirectories);
|
||||
foreach (string file in files)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,7 +20,10 @@ namespace Microsoft.Workload.Build.Tasks
|
|||
public class InstallWorkloadFromArtifacts : Task
|
||||
{
|
||||
[Required, NotNull]
|
||||
public ITaskItem[] WorkloadIds { get; set; } = Array.Empty<ITaskItem>();
|
||||
public ITaskItem[] WorkloadIds { get; set; } = Array.Empty<ITaskItem>();
|
||||
|
||||
[Required, NotNull]
|
||||
public ITaskItem[] InstallTargets { get; set; } = Array.Empty<ITaskItem>();
|
||||
|
||||
[Required, NotNull]
|
||||
public string? VersionBand { get; set; }
|
||||
|
|
@ -32,22 +35,71 @@ namespace Microsoft.Workload.Build.Tasks
|
|||
public string? TemplateNuGetConfigPath { get; set; }
|
||||
|
||||
[Required, NotNull]
|
||||
public string? SdkDir { get; set; }
|
||||
public string SdkWithNoWorkloadInstalledPath { get; set; } = string.Empty;
|
||||
|
||||
public bool OnlyUpdateManifests{ get; set; }
|
||||
|
||||
private const string s_nugetInsertionTag = "<!-- TEST_RESTORE_SOURCES_INSERTION_LINE -->";
|
||||
private string AllManifestsStampPath => Path.Combine(SdkWithNoWorkloadInstalledPath, ".all-manifests.stamp");
|
||||
|
||||
public override bool Execute()
|
||||
{
|
||||
try
|
||||
{
|
||||
foreach (var workloadIdItem in WorkloadIds)
|
||||
if (!Directory.Exists(SdkWithNoWorkloadInstalledPath))
|
||||
throw new LogAsErrorException($"Cannot find {nameof(SdkWithNoWorkloadInstalledPath)}={SdkWithNoWorkloadInstalledPath}");
|
||||
|
||||
if (!Directory.Exists(LocalNuGetsPath))
|
||||
throw new LogAsErrorException($"Cannot find {nameof(LocalNuGetsPath)}={LocalNuGetsPath} . " +
|
||||
"Set it to the Shipping packages directory in artifacts.");
|
||||
|
||||
if (!InstallAllManifests())
|
||||
return false;
|
||||
|
||||
if (OnlyUpdateManifests)
|
||||
return !Log.HasLoggedErrors;
|
||||
|
||||
InstallWorkloadRequest[] selectedRequests = InstallTargets
|
||||
.SelectMany(workloadToInstall =>
|
||||
{
|
||||
if (!HasMetadata(workloadToInstall, nameof(workloadToInstall), "Variants", Log))
|
||||
throw new LogAsErrorException($"Missing Variants metadata on item '{workloadToInstall.ItemSpec}'");
|
||||
|
||||
return workloadToInstall
|
||||
.GetMetadata("Variants")
|
||||
.Split(";", StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
|
||||
.Select(v => (variant: v, target: workloadToInstall));
|
||||
})
|
||||
.SelectMany(w =>
|
||||
{
|
||||
IEnumerable<InstallWorkloadRequest> workloads = WorkloadIds.Where(wi => wi.GetMetadata("Variant") == w.variant)
|
||||
.Select(wi => new InstallWorkloadRequest(wi, w.target));
|
||||
return workloads.Any()
|
||||
? workloads
|
||||
: throw new LogAsErrorException($"Could not find any workload variant named '{w.variant}'");
|
||||
}).ToArray();
|
||||
|
||||
foreach (InstallWorkloadRequest req in selectedRequests)
|
||||
{
|
||||
if (!ExecuteInternal(workloadIdItem))
|
||||
if (Directory.Exists(req.TargetPath))
|
||||
{
|
||||
Log.LogMessage(MessageImportance.Low, $"Deleting directory {req.TargetPath}");
|
||||
Directory.Delete(req.TargetPath, recursive: true);
|
||||
}
|
||||
}
|
||||
|
||||
string cachePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
|
||||
foreach (InstallWorkloadRequest req in selectedRequests)
|
||||
{
|
||||
Log.LogMessage(MessageImportance.High, $"** Installing workload {req.WorkloadId} in {req.TargetPath} **");
|
||||
if (!req.Validate(Log))
|
||||
return false;
|
||||
|
||||
if (!ExecuteInternal(req) && !req.IgnoreErrors)
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
return !Log.HasLoggedErrors;
|
||||
}
|
||||
catch (LogAsErrorException laee)
|
||||
{
|
||||
|
|
@ -56,73 +108,136 @@ namespace Microsoft.Workload.Build.Tasks
|
|||
}
|
||||
}
|
||||
|
||||
private bool ExecuteInternal(ITaskItem workloadId)
|
||||
private bool ExecuteInternal(InstallWorkloadRequest req)
|
||||
{
|
||||
if (!HasMetadata(workloadId, nameof(workloadId), "Version") ||
|
||||
!HasMetadata(workloadId, nameof(workloadId), "ManifestName"))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!Directory.Exists(SdkDir))
|
||||
{
|
||||
Log.LogError($"Cannot find SdkDir={SdkDir}");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!File.Exists(TemplateNuGetConfigPath))
|
||||
{
|
||||
Log.LogError($"Cannot find TemplateNuGetConfigPath={TemplateNuGetConfigPath}");
|
||||
return false;
|
||||
}
|
||||
|
||||
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Installing workload manifest {workloadId.ItemSpec} **{Environment.NewLine}");
|
||||
Log.LogMessage(MessageImportance.Low, $"Duplicating {SdkWithNoWorkloadInstalledPath} into {req.TargetPath}");
|
||||
Utils.DirectoryCopy(SdkWithNoWorkloadInstalledPath, req.TargetPath);
|
||||
|
||||
string nugetConfigContents = GetNuGetConfig();
|
||||
if (!InstallWorkloadManifest(workloadId, workloadId.GetMetadata("ManifestName"), workloadId.GetMetadata("Version"), nugetConfigContents, stopOnMissing: true))
|
||||
if (!InstallPacks(req, nugetConfigContents))
|
||||
return false;
|
||||
|
||||
if (OnlyUpdateManifests)
|
||||
return !Log.HasLoggedErrors;
|
||||
|
||||
if (!InstallPacks(workloadId, nugetConfigContents))
|
||||
return false;
|
||||
|
||||
UpdateAppRef(workloadId.GetMetadata("Version"));
|
||||
UpdateAppRef(req.TargetPath, req.Version);
|
||||
|
||||
return !Log.HasLoggedErrors;
|
||||
}
|
||||
|
||||
private bool InstallPacks(ITaskItem workloadId, string nugetConfigContents)
|
||||
private bool InstallAllManifests()
|
||||
{
|
||||
var allManifestPkgs = Directory.EnumerateFiles(LocalNuGetsPath, "*Manifest*nupkg");
|
||||
if (!AnyInputsNewerThanOutput(AllManifestsStampPath, allManifestPkgs))
|
||||
{
|
||||
Log.LogMessage(MessageImportance.Low,
|
||||
$"Skipping installing manifests because the {AllManifestsStampPath} " +
|
||||
$"is newer than packages {string.Join(',', allManifestPkgs)}.");
|
||||
return true;
|
||||
}
|
||||
|
||||
// HACK BEGIN - because sdk doesn't yet have the net6/net7 manifest names in the known workloads
|
||||
// list
|
||||
string? txtPath = Directory.EnumerateFiles(Path.Combine(SdkWithNoWorkloadInstalledPath, "sdk"), "IncludedWorkloadManifests.txt",
|
||||
new EnumerationOptions { RecurseSubdirectories = true, MaxRecursionDepth = 2})
|
||||
.FirstOrDefault();
|
||||
if (txtPath is null)
|
||||
throw new LogAsErrorException($"Could not find IncludedWorkloadManifests.txt in {SdkWithNoWorkloadInstalledPath}");
|
||||
|
||||
string stampPath = Path.Combine(Path.GetDirectoryName(txtPath)!, ".stamp");
|
||||
if (!File.Exists(stampPath))
|
||||
{
|
||||
Log.LogMessage(MessageImportance.High, $"txtPath: {txtPath}");
|
||||
string newTxt = File.ReadAllText(txtPath)
|
||||
.Replace("microsoft.net.workload.mono.toolchain",
|
||||
$"microsoft.net.workload.mono.toolchain.net6{Environment.NewLine}microsoft.net.workload.mono.toolchain.net7")
|
||||
.Replace("microsoft.net.workload.emscripten",
|
||||
$"microsoft.net.workload.emscripten.net6{Environment.NewLine}microsoft.net.workload.emscripten.net7");
|
||||
File.WriteAllText(txtPath, newTxt);
|
||||
File.WriteAllText(stampPath, "");
|
||||
}
|
||||
|
||||
string p = Path.Combine(SdkWithNoWorkloadInstalledPath, "sdk-manifests", "7.0.100", "microsoft.net.workload.mono.toolchain");
|
||||
Log.LogMessage(MessageImportance.High, $"Deleting {p}");
|
||||
if (Directory.Exists(p))
|
||||
Directory.Delete(p, recursive: true);
|
||||
p = Path.Combine(SdkWithNoWorkloadInstalledPath, "sdk-manifests", "7.0.100", "microsoft.net.workload.emscripten");
|
||||
Log.LogMessage(MessageImportance.High, $"Deleting {p}");
|
||||
if (Directory.Exists(p))
|
||||
Directory.Delete(p, recursive: true);
|
||||
// HACK END
|
||||
|
||||
string nugetConfigContents = GetNuGetConfig();
|
||||
HashSet<string> manifestsInstalled = new();
|
||||
foreach (ITaskItem workload in WorkloadIds)
|
||||
{
|
||||
InstallWorkloadRequest req = new(workload, new TaskItem());
|
||||
|
||||
if (manifestsInstalled.Contains(req.ManifestName))
|
||||
{
|
||||
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Manifests for workload {req.WorkloadId} are already installed **{Environment.NewLine}");
|
||||
continue;
|
||||
}
|
||||
|
||||
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Installing manifests for workload {req.WorkloadId} **");
|
||||
if (!InstallWorkloadManifest(workload,
|
||||
req.ManifestName,
|
||||
req.Version,
|
||||
SdkWithNoWorkloadInstalledPath,
|
||||
nugetConfigContents,
|
||||
stopOnMissing: true))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
manifestsInstalled.Add(req.ManifestName);
|
||||
}
|
||||
|
||||
File.WriteAllText(AllManifestsStampPath, string.Empty);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool InstallPacks(InstallWorkloadRequest req, string nugetConfigContents)
|
||||
{
|
||||
string nugetConfigPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
|
||||
File.WriteAllText(nugetConfigPath, nugetConfigContents);
|
||||
|
||||
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** workload install **{Environment.NewLine}");
|
||||
// Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** dotnet workload install {req.WorkloadId} **{Environment.NewLine}");
|
||||
(int exitCode, string output) = Utils.TryRunProcess(
|
||||
Log,
|
||||
Path.Combine(SdkDir, "dotnet"),
|
||||
$"workload install --skip-manifest-update --no-cache --configfile \"{nugetConfigPath}\" {workloadId.ItemSpec}",
|
||||
Path.Combine(req.TargetPath, "dotnet"),
|
||||
$"workload install --skip-manifest-update --no-cache --configfile \"{nugetConfigPath}\" {req.WorkloadId}",
|
||||
workingDir: Path.GetTempPath(),
|
||||
silent: false,
|
||||
logStdErrAsMessage: req.IgnoreErrors,
|
||||
debugMessageImportance: MessageImportance.High);
|
||||
if (exitCode != 0)
|
||||
{
|
||||
Log.LogError($"workload install failed with exit code {exitCode}: {output}");
|
||||
if (req.IgnoreErrors)
|
||||
{
|
||||
Log.LogMessage(MessageImportance.High,
|
||||
$"{Environment.NewLine} ** Ignoring workload installation failure exit code {exitCode}. **{Environment.NewLine}");
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.LogError($"workload install failed with exit code {exitCode}: {output}");
|
||||
}
|
||||
|
||||
foreach (string dir in Directory.EnumerateDirectories(Path.Combine(SdkDir, "sdk-manifests"), "*", SearchOption.AllDirectories))
|
||||
Log.LogMessage(MessageImportance.Low, $"\t{Path.Combine(SdkDir, "sdk-manifests", dir)}");
|
||||
foreach (string dir in Directory.EnumerateDirectories(Path.Combine(req.TargetPath, "sdk-manifests"), "*", SearchOption.AllDirectories))
|
||||
Log.LogMessage(MessageImportance.Low, $"\t{Path.Combine(req.TargetPath, "sdk-manifests", dir)}");
|
||||
|
||||
foreach (string dir in Directory.EnumerateDirectories(Path.Combine(SdkDir, "packs"), "*", SearchOption.AllDirectories))
|
||||
Log.LogMessage(MessageImportance.Low, $"\t{Path.Combine(SdkDir, "packs", dir)}");
|
||||
|
||||
return false;
|
||||
foreach (string dir in Directory.EnumerateDirectories(Path.Combine(req.TargetPath, "packs"), "*", SearchOption.AllDirectories))
|
||||
Log.LogMessage(MessageImportance.Low, $"\t{Path.Combine(req.TargetPath, "packs", dir)}");
|
||||
}
|
||||
|
||||
return !Log.HasLoggedErrors;
|
||||
}
|
||||
|
||||
private void UpdateAppRef(string version)
|
||||
private void UpdateAppRef(string sdkPath, string version)
|
||||
{
|
||||
Log.LogMessage(MessageImportance.High, $"{Environment.NewLine}** Updating Targeting pack **{Environment.NewLine}");
|
||||
|
||||
|
|
@ -131,7 +246,7 @@ namespace Microsoft.Workload.Build.Tasks
|
|||
throw new LogAsErrorException($"Could not find {pkgPath} needed to update the targeting pack to the newly built one." +
|
||||
" Make sure to build the subset `packs`, like `./build.sh -os browser -s mono+libs+packs`.");
|
||||
|
||||
string packDir = Path.Combine(SdkDir, "packs", "Microsoft.NETCore.App.Ref");
|
||||
string packDir = Path.Combine(sdkPath, "packs", "Microsoft.NETCore.App.Ref");
|
||||
string[] dirs = Directory.EnumerateDirectories(packDir).ToArray();
|
||||
if (dirs.Length != 1)
|
||||
throw new LogAsErrorException($"Expected to find exactly one versioned directory under {packDir}, but got " +
|
||||
|
|
@ -150,28 +265,28 @@ namespace Microsoft.Workload.Build.Tasks
|
|||
private string GetNuGetConfig()
|
||||
{
|
||||
string contents = File.ReadAllText(TemplateNuGetConfigPath);
|
||||
if (contents.IndexOf(s_nugetInsertionTag) < 0)
|
||||
if (contents.IndexOf(s_nugetInsertionTag, StringComparison.InvariantCultureIgnoreCase) < 0)
|
||||
throw new LogAsErrorException($"Could not find {s_nugetInsertionTag} in {TemplateNuGetConfigPath}");
|
||||
|
||||
return contents.Replace(s_nugetInsertionTag, $@"<add key=""nuget-local"" value=""{LocalNuGetsPath}"" />");
|
||||
}
|
||||
|
||||
private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string version, string nugetConfigContents, bool stopOnMissing)
|
||||
private bool InstallWorkloadManifest(ITaskItem workloadId, string name, string version, string sdkDir, string nugetConfigContents, bool stopOnMissing)
|
||||
{
|
||||
Log.LogMessage(MessageImportance.High, $"Installing workload manifest for {name}/{version}");
|
||||
Log.LogMessage(MessageImportance.High, $" ** Installing manifest: {name}/{version}");
|
||||
|
||||
// Find any existing directory with the manifest name, ignoring the case
|
||||
// Multiple directories for a manifest, differing only in case causes
|
||||
// workload install to fail due to duplicate manifests!
|
||||
// This is applicable only on case-sensitive filesystems
|
||||
string outputDir = FindSubDirIgnoringCase(Path.Combine(SdkDir, "sdk-manifests", VersionBand), name);
|
||||
string outputDir = FindSubDirIgnoringCase(Path.Combine(sdkDir, "sdk-manifests", VersionBand), name);
|
||||
|
||||
PackageReference pkgRef = new(Name: $"{name}.Manifest-{VersionBand}",
|
||||
Version: version,
|
||||
OutputDir: outputDir,
|
||||
relativeSourceDir: "data");
|
||||
|
||||
if (!PackageInstaller.Install(new[]{ pkgRef }, nugetConfigContents, Log, stopOnMissing))
|
||||
if (!PackageInstaller.Install(new[] { pkgRef }, nugetConfigContents, Log, stopOnMissing))
|
||||
return false;
|
||||
|
||||
string manifestDir = pkgRef.OutputDir;
|
||||
|
|
@ -209,7 +324,7 @@ namespace Microsoft.Workload.Build.Tasks
|
|||
{
|
||||
foreach ((string depName, string depVersion) in manifest.DependsOn)
|
||||
{
|
||||
if (!InstallWorkloadManifest(workloadId, depName, depVersion, nugetConfigContents, stopOnMissing: false))
|
||||
if (!InstallWorkloadManifest(workloadId, depName, depVersion, sdkDir, nugetConfigContents, stopOnMissing: false))
|
||||
{
|
||||
Log.LogWarning($"Could not install manifest {depName}/{depVersion}. This can be ignored if the workload {workloadId.ItemSpec} doesn't depend on it.");
|
||||
continue;
|
||||
|
|
@ -220,31 +335,35 @@ namespace Microsoft.Workload.Build.Tasks
|
|||
return true;
|
||||
}
|
||||
|
||||
private bool HasMetadata(ITaskItem item, string itemName, string metadataName)
|
||||
private static bool HasMetadata(ITaskItem item, string itemName, string metadataName, TaskLoggingHelper log)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(item.GetMetadata(metadataName)))
|
||||
return true;
|
||||
|
||||
Log.LogError($"{itemName} item ({item.ItemSpec}) is missing Name metadata");
|
||||
log.LogError($"{itemName} item ({item.ItemSpec}) is missing {metadataName} metadata");
|
||||
return false;
|
||||
}
|
||||
|
||||
private string FindSubDirIgnoringCase(string parentDir, string dirName)
|
||||
{
|
||||
IEnumerable<string> matchingDirs = Directory.EnumerateDirectories(parentDir,
|
||||
string[] matchingDirs = Directory.EnumerateDirectories(parentDir,
|
||||
dirName,
|
||||
new EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive });
|
||||
new EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive })
|
||||
.ToArray();
|
||||
|
||||
string? first = matchingDirs.FirstOrDefault();
|
||||
if (matchingDirs.Count() > 1)
|
||||
if (matchingDirs.Length > 1)
|
||||
{
|
||||
Log.LogWarning($"Found multiple directories with names that differ only in case. {string.Join(", ", matchingDirs.ToArray())}"
|
||||
Log.LogWarning($"Found multiple directories with names that differ only in case. {string.Join(", ", matchingDirs)}"
|
||||
+ $"{Environment.NewLine}Using the first one: {first}");
|
||||
}
|
||||
|
||||
return first ?? Path.Combine(parentDir, dirName.ToLower(CultureInfo.InvariantCulture));
|
||||
}
|
||||
|
||||
private static bool AnyInputsNewerThanOutput(string output, IEnumerable<string> inputs)
|
||||
=> inputs.Any(i => Utils.IsNewerThan(i, output));
|
||||
|
||||
private sealed record ManifestInformation(
|
||||
object Version,
|
||||
string Description,
|
||||
|
|
@ -272,6 +391,35 @@ namespace Microsoft.Workload.Build.Tasks
|
|||
[property: JsonPropertyName("alias-to")]
|
||||
Dictionary<string, string> AliasTo
|
||||
);
|
||||
|
||||
internal sealed record InstallWorkloadRequest(
|
||||
ITaskItem Workload,
|
||||
ITaskItem Target)
|
||||
{
|
||||
public string ManifestName => Workload.GetMetadata("ManifestName");
|
||||
public string Version => Workload.GetMetadata("Version");
|
||||
public string TargetPath => Target.GetMetadata("InstallPath");
|
||||
public bool IgnoreErrors => Workload.GetMetadata("IgnoreErrors").ToLowerInvariant() == "true";
|
||||
public string WorkloadId => Workload.ItemSpec;
|
||||
|
||||
public bool Validate(TaskLoggingHelper log)
|
||||
{
|
||||
if (!HasMetadata(Workload, nameof(Workload), "Version", log) ||
|
||||
!HasMetadata(Workload, nameof(Workload), "ManifestName", log) ||
|
||||
!HasMetadata(Target, nameof(Target), "InstallPath", log))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(TargetPath))
|
||||
{
|
||||
log.LogError($"InstallPath is empty for workload {Workload.ItemSpec}");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
internal sealed record PackageReference(string Name,
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ namespace Wasm.Build.Tests
|
|||
"..",
|
||||
"..",
|
||||
"..",
|
||||
"dotnet-workload");
|
||||
"dotnet-net7");
|
||||
if (Directory.Exists(probePath))
|
||||
sdkForWorkloadPath = Path.GetFullPath(probePath);
|
||||
else
|
||||
|
|
@ -112,6 +112,12 @@ namespace Wasm.Build.Tests
|
|||
// helps with debugging
|
||||
EnvVars["WasmNativeStrip"] = "false";
|
||||
|
||||
// Works around an issue in msbuild due to which
|
||||
// second, and subsequent builds fail without any details
|
||||
// in the logs
|
||||
EnvVars["DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER"] = "1";
|
||||
DefaultBuildArgs += " /nr:false";
|
||||
|
||||
if (OperatingSystem.IsWindows())
|
||||
{
|
||||
EnvVars["WasmCachePath"] = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
|
||||
|
|
|
|||
|
|
@ -488,6 +488,7 @@ namespace Wasm.Build.Tests
|
|||
$"-bl:{logPath}",
|
||||
$"-p:Configuration={config}",
|
||||
"-p:BlazorEnableCompression=false",
|
||||
"-nr:false",
|
||||
setWasmDevel ? "-p:_WasmDevel=true" : string.Empty
|
||||
}.Concat(extraArgs).ToArray();
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ For this, the builds get cached using `BuildArgs` as the key.
|
|||
|
||||
- when running locally, the default is to test with workloads. For this, sdk
|
||||
with `$(SdkVersionForWorkloadTesting)` is installed in
|
||||
`artifacts/bin/dotnet-workload`. And the workload packs are installed there
|
||||
`artifacts/bin/dotnet-net7`. And the workload packs are installed there
|
||||
using packages in `artifacts/packages/$(Configuration)/Shipping`.
|
||||
- If the packages get updated, then the workload will get installed again.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,4 @@
|
|||
<Project>
|
||||
<PropertyGroup>
|
||||
<LocalFrameworkOverrideName>Microsoft.NETCore.App</LocalFrameworkOverrideName>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<EmscriptenEnvVars Include="FROZEN_CACHE=" Condition="'$(OS)' == 'Windows_NT'" />
|
||||
</ItemGroup>
|
||||
|
|
@ -9,67 +6,4 @@
|
|||
<Target Name="PrintRuntimePackPath" BeforeTargets="Publish">
|
||||
<Message Text="** MicrosoftNetCoreAppRuntimePackDir : %(ResolvedRuntimePack.PackageDirectory)" Importance="High" />
|
||||
</Target>
|
||||
|
||||
<!-- SDK tries to download runtime packs when RuntimeIdentifier is set, remove them from PackageDownload item. -->
|
||||
<Target Name="RemoveRuntimePackFromDownloadItem"
|
||||
AfterTargets="ProcessFrameworkReferences"
|
||||
Condition="'$(WasmNativeWorkload)' == 'true'">
|
||||
<ItemGroup>
|
||||
<PackageDownload Remove="@(PackageDownload)"
|
||||
Condition="'$(UsePackageDownload)' == 'true' and $([System.String]::Copy('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime'))" />
|
||||
<PackageReference Remove="@(PackageReference)"
|
||||
Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime'))" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Use local targeting pack for NetCoreAppCurrent. -->
|
||||
<Target Name="UpdateTargetingAndRuntimePack"
|
||||
AfterTargets="ResolveFrameworkReferences"
|
||||
Condition="'$(WasmNativeWorkload)' == 'true'">
|
||||
<ItemGroup>
|
||||
<ResolvedRuntimePack
|
||||
Update="Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
FrameworkName="Microsoft.NETCore.App"
|
||||
NuGetPackageId="Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
NuGetPackageVersion="$(RuntimePackInWorkloadVersion)"
|
||||
PackageDirectory="$(NetCoreTargetingPackRoot)\Microsoft.NETCore.App.Runtime.Mono.browser-wasm\$(RuntimePackInWorkloadVersion)"
|
||||
RuntimeIdentifier="browser-wasm" />
|
||||
|
||||
<ResolvedFrameworkReference Update="Microsoft.NETCore.App"
|
||||
RuntimePackName="Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
RuntimePackVersion="$(RuntimePackInWorkloadVersion)"
|
||||
RuntimePackPath="$(NetCoreTargetingPackRoot)\Microsoft.NETCore.App.Runtime.Mono.browser-wasm\$(RuntimePackInWorkloadVersion)"
|
||||
RuntimeIdentifier="browser-wasm" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Update the local targeting pack's version as it's written into the runtimeconfig.json file to select the right framework. -->
|
||||
<Target Name="UpdateRuntimeFrameworkVersion"
|
||||
AfterTargets="ResolveTargetingPackAssets"
|
||||
Condition="'$(WasmNativeWorkload)' == 'true'">
|
||||
<ItemGroup>
|
||||
<RuntimeFramework Version="$(RuntimePackInWorkloadVersion)"
|
||||
Condition="'%(RuntimeFramework.FrameworkName)' == 'Microsoft.NETCore.App'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Filter out conflicting implicit assembly references. -->
|
||||
<Target Name="FilterImplicitAssemblyReferences"
|
||||
Condition="'$(WasmNativeWorkload)' == 'true'"
|
||||
DependsOnTargets="ResolveProjectReferences"
|
||||
AfterTargets="ResolveTargetingPackAssets">
|
||||
<ItemGroup>
|
||||
<_targetingPackReferenceExclusion Include="$(TargetName)" />
|
||||
<_targetingPackReferenceExclusion Include="@(_ResolvedProjectReferencePaths->'%(Filename)')" />
|
||||
<_targetingPackReferenceExclusion Include="@(DefaultReferenceExclusion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<_targetingPackReferenceWithExclusion Include="@(Reference)">
|
||||
<Exclusion>%(_targetingPackReferenceExclusion.Identity)</Exclusion>
|
||||
</_targetingPackReferenceWithExclusion>
|
||||
<Reference Remove="@(_targetingPackReferenceWithExclusion)"
|
||||
Condition="'%(_targetingPackReferenceWithExclusion.ExternallyResolved)' == 'true' and '%(_targetingPackReferenceWithExclusion.Filename)' == '%(_targetingPackReferenceWithExclusion.Exclusion)'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -2,24 +2,4 @@
|
|||
<Target Name="PrintRuntimePackPath" BeforeTargets="Publish">
|
||||
<Message Text="** MicrosoftNetCoreAppRuntimePackDir : %(ResolvedRuntimePack.PackageDirectory)" Importance="High" />
|
||||
</Target>
|
||||
|
||||
<!-- Use local targeting pack for NetCoreAppCurrent. -->
|
||||
<Target Name="UpdateTargetingAndRuntimePack"
|
||||
AfterTargets="ResolveFrameworkReferences">
|
||||
<ItemGroup>
|
||||
<ResolvedRuntimePack
|
||||
Update="Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
FrameworkName="Microsoft.NETCore.App"
|
||||
NuGetPackageId="Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
NuGetPackageVersion="$(RuntimePackInWorkloadVersion)"
|
||||
PackageDirectory="$(MicrosoftNetCoreAppRuntimePackLocationToUse)"
|
||||
RuntimeIdentifier="browser-wasm" />
|
||||
|
||||
<ResolvedFrameworkReference Update="Microsoft.NETCore.App"
|
||||
RuntimePackName="Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
RuntimePackVersion="$(RuntimePackInWorkloadVersion)"
|
||||
RuntimePackPath="$(MicrosoftNetCoreAppRuntimePackLocationToUse)"
|
||||
RuntimeIdentifier="browser-wasm" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -94,10 +94,10 @@ exit /b %EXIT_CODE%
|
|||
REM Functions
|
||||
:SetEnvVars
|
||||
if [%TEST_USING_WORKLOADS%] == [true] (
|
||||
set _DIR_NAME=dotnet-workload
|
||||
set _DIR_NAME=dotnet-net7
|
||||
set SDK_HAS_WORKLOAD_INSTALLED=true
|
||||
) else (
|
||||
set _DIR_NAME=sdk-no-workload
|
||||
set _DIR_NAME=dotnet-none
|
||||
set SDK_HAS_WORKLOAD_INSTALLED=false
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -68,10 +68,10 @@ function set_env_vars()
|
|||
{
|
||||
local _DIR_NAME=
|
||||
if [ "x$TEST_USING_WORKLOADS" = "xtrue" ]; then
|
||||
_DIR_NAME=dotnet-workload
|
||||
_DIR_NAME=dotnet-net7
|
||||
export SDK_HAS_WORKLOAD_INSTALLED=true
|
||||
else
|
||||
_DIR_NAME=sdk-no-workload
|
||||
_DIR_NAME=dotnet-none
|
||||
export SDK_HAS_WORKLOAD_INSTALLED=false
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -6,74 +6,4 @@
|
|||
<Target Name="PrintRuntimePackPath" BeforeTargets="Publish">
|
||||
<Message Text="** MicrosoftNetCoreAppRuntimePackDir : %(ResolvedRuntimePack.PackageDirectory)" Importance="High" />
|
||||
</Target>
|
||||
|
||||
<!-- Add the resolved targeting pack to the assembly search path. -->
|
||||
<!-- <Target Name="UseTargetingPackForAssemblySearchPaths"
|
||||
BeforeTargets="ResolveAssemblyReferences;
|
||||
DesignTimeResolveAssemblyReferences"
|
||||
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
|
||||
<PropertyGroup>
|
||||
<AssemblySearchPaths>$(AssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</AssemblySearchPaths>
|
||||
<DesignTimeAssemblySearchPaths>$(DesignTimeAssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</DesignTimeAssemblySearchPaths>
|
||||
</PropertyGroup>
|
||||
</Target> -->
|
||||
|
||||
<!-- SDK tries to download runtime packs when RuntimeIdentifier is set, remove them from PackageDownload item. -->
|
||||
<Target Name="RemoveRuntimePackFromDownloadItem"
|
||||
AfterTargets="ProcessFrameworkReferences">
|
||||
<ItemGroup>
|
||||
<PackageDownload Remove="@(PackageDownload)"
|
||||
Condition="'$(UsePackageDownload)' == 'true' and $([System.String]::Copy('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime'))" />
|
||||
<PackageReference Remove="@(PackageReference)"
|
||||
Condition="'$(UsePackageDownload)' != 'true' and $([System.String]::Copy('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime'))" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Use local targeting pack for NetCoreAppCurrent. -->
|
||||
<Target Name="UpdateTargetingAndRuntimePack"
|
||||
AfterTargets="ResolveFrameworkReferences">
|
||||
<ItemGroup>
|
||||
<ResolvedRuntimePack
|
||||
Update="Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
FrameworkName="Microsoft.NETCore.App"
|
||||
NuGetPackageId="Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
NuGetPackageVersion="$(RuntimePackInWorkloadVersion)"
|
||||
PackageDirectory="$(NetCoreTargetingPackRoot)\Microsoft.NETCore.App.Runtime.Mono.browser-wasm\$(RuntimePackInWorkloadVersion)"
|
||||
RuntimeIdentifier="browser-wasm" />
|
||||
|
||||
<ResolvedFrameworkReference Update="Microsoft.NETCore.App"
|
||||
RuntimePackName="Microsoft.NETCore.App.Runtime.Mono.browser-wasm"
|
||||
RuntimePackVersion="$(RuntimePackInWorkloadVersion)"
|
||||
RuntimePackPath="$(NetCoreTargetingPackRoot)\Microsoft.NETCore.App.Runtime.Mono.browser-wasm\$(RuntimePackInWorkloadVersion)"
|
||||
RuntimeIdentifier="browser-wasm" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Update the local targeting pack's version as it's written into the runtimeconfig.json file to select the right framework. -->
|
||||
<Target Name="UpdateRuntimeFrameworkVersion"
|
||||
AfterTargets="ResolveTargetingPackAssets">
|
||||
<ItemGroup>
|
||||
<RuntimeFramework Version="$(RuntimePackInWorkloadVersion)"
|
||||
Condition="'%(RuntimeFramework.FrameworkName)' == 'Microsoft.NETCore.App'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<!-- Filter out conflicting implicit assembly references. -->
|
||||
<Target Name="FilterImplicitAssemblyReferences"
|
||||
DependsOnTargets="ResolveProjectReferences"
|
||||
AfterTargets="ResolveTargetingPackAssets">
|
||||
<ItemGroup>
|
||||
<_targetingPackReferenceExclusion Include="$(TargetName)" />
|
||||
<_targetingPackReferenceExclusion Include="@(_ResolvedProjectReferencePaths->'%(Filename)')" />
|
||||
<_targetingPackReferenceExclusion Include="@(DefaultReferenceExclusion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<_targetingPackReferenceWithExclusion Include="@(Reference)">
|
||||
<Exclusion>%(_targetingPackReferenceExclusion.Identity)</Exclusion>
|
||||
</_targetingPackReferenceWithExclusion>
|
||||
<Reference Remove="@(_targetingPackReferenceWithExclusion)"
|
||||
Condition="'%(_targetingPackReferenceWithExclusion.ExternallyResolved)' == 'true' and '%(_targetingPackReferenceWithExclusion.Filename)' == '%(_targetingPackReferenceWithExclusion.Exclusion)'" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -79,8 +79,8 @@
|
|||
<!-- Shorten package names to avoid long path issues in Visual Studio -->
|
||||
<ItemGroup>
|
||||
<!-- These need to be in order - matching rules will try in order. -->
|
||||
<ShortNames Include="Microsoft.NET.Workload.Mono.ToolChain.">
|
||||
<Replacement>Mono</Replacement>
|
||||
<ShortNames Include="Microsoft.NET.Workload.Mono.ToolChain.net">
|
||||
<Replacement>Mono.</Replacement>
|
||||
</ShortNames>
|
||||
<ShortNames Include="microsoft.netcore.app.runtime;Microsoft.NETCore.App.Runtime;microsoft.net.runtime;Microsoft.NET.Runtime">
|
||||
<Replacement>Microsoft</Replacement>
|
||||
|
|
@ -91,10 +91,11 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Mono.ToolChain.Manifest-*.nupkg" MsiVersion="$(MsiVersion)"/>
|
||||
<ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Mono.ToolChain.*Manifest-*.nupkg" MsiVersion="$(MsiVersion)"/>
|
||||
</ItemGroup>
|
||||
|
||||
<CreateVisualStudioWorkload BaseIntermediateOutputPath="$(WorkloadIntermediateOutputPath)"
|
||||
AllowMissingPacks="True"
|
||||
BaseOutputPath="$(WorkloadOutputPath)"
|
||||
ComponentResources="$(ComponentResources)"
|
||||
PackageSource="$(PackageSource)"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue