diff --git a/eng/Versions.props b/eng/Versions.props index e61a62510f..0232efbf99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,6 +6,8 @@ 1 7.0.100 3.1.12 + 2.1.13 + 6.0.8 7.0.0-beta.22372.1 diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net6/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj similarity index 88% rename from eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj rename to eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net6/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj index 5a8369a91d..6ecea52983 100644 --- a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj +++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net6/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj @@ -13,7 +13,7 @@ - Microsoft.NET.Workload.Emscripten.Manifest-$(WorkloadSdkBandVersion) + Microsoft.NET.Workload.Emscripten.Manifest.net6-$(WorkloadSdkBandVersion) @@ -34,8 +34,8 @@ <_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" /> - <_WorkloadManifestValues Include="PackageVersion" Value="$(PackageVersion)" /> - <_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersion)" /> + <_WorkloadManifestValues Include="PackageVersionNet6" Value="$(PackageVersionNet6)" /> + <_WorkloadManifestValues Include="EmscriptenVersionNet6" Value="$(EmscriptenVersionNet6)" /> + + + + + + diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net7/Microsoft.NET.Workload.Emscripten.Manifest.net7.pkgproj b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net7/Microsoft.NET.Workload.Emscripten.Manifest.net7.pkgproj new file mode 100644 index 0000000000..23c4213018 --- /dev/null +++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net7/Microsoft.NET.Workload.Emscripten.Manifest.net7.pkgproj @@ -0,0 +1,49 @@ + + + + + + + + + Internal toolchain package not meant for direct consumption. Please do not reference directly. + Internal toolchain package not meant for direct consumption. Please do not reference directly. + + + + + + Microsoft.NET.Workload.Emscripten.Manifest.net7-$(WorkloadSdkBandVersion) + + + + $(IntermediateOutputPath)WorkloadManifest.json + + + + + + + + + + + + PackageVersion=$(PackageVersion); + + + + <_WorkloadManifestValues Include="WorkloadVersion" Value="$(PackageVersion)" /> + <_WorkloadManifestValues Include="PackageVersion" Value="$(PackageVersion)" /> + <_WorkloadManifestValues Include="EmscriptenVersion" Value="$(EmscriptenVersion)" /> + + + + + + + + diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net7/WorkloadManifest.json.in similarity index 87% rename from eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in rename to eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net7/WorkloadManifest.json.in index 2545e628cb..0045ca3760 100644 --- a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in +++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net7/WorkloadManifest.json.in @@ -1,7 +1,7 @@ { "version": "${WorkloadVersion}", "workloads": { - "microsoft-net-sdk-emscripten": { + "microsoft-net-sdk-emscripten-net7": { "abstract": true, "description": "Emscripten SDK compiler tooling", "packs": [ @@ -13,9 +13,7 @@ } }, "packs": { - "Microsoft.NET.Runtime.Emscripten.Node" : { - "kind": "Sdk", - "version": "${PackageVersion}", + "Microsoft.NET.Runtime.Emscripten.Node.net7" : { "alias-to": { "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.win-x64", "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.linux-x64", @@ -23,7 +21,7 @@ "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64" } }, - "Microsoft.NET.Runtime.Emscripten.Python" : { + "Microsoft.NET.Runtime.Emscripten.Python.net7" : { "kind": "Sdk", "version": "${PackageVersion}", "alias-to": { @@ -32,7 +30,7 @@ "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64" } }, - "Microsoft.NET.Runtime.Emscripten.Sdk" : { + "Microsoft.NET.Runtime.Emscripten.Sdk.net7" : { "kind": "Sdk", "version": "${PackageVersion}", "alias-to": { diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.targets b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net7/WorkloadManifest.targets similarity index 86% rename from eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.targets rename to eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net7/WorkloadManifest.targets index ebb7862e53..fbec4750df 100644 --- a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.targets +++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest.net7/WorkloadManifest.targets @@ -18,9 +18,9 @@ false - - - - + + + +