From e92432d68880afaaaf8f39804fea1a2c3a5dd9e5 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 31 Jan 2023 12:48:38 -0600 Subject: [PATCH 1/3] Bump emsdk to preview1 Update workload featureband logic --- eng/Version.Details.xml | 21 ++++++++++-------- eng/Versions.props | 24 +++++++++++++-------- src/redist/targets/BundledManifests.targets | 13 ++++++----- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0775cbf88..127a0fef5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,30 +167,33 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 0fe864fc71191ff4ee18e59ef0af2929ca367a11 + 75ccb6879a3a4710558b28491f19555eb15fe40f - + https://github.com/dotnet/emsdk - 0fe864fc71191ff4ee18e59ef0af2929ca367a11 + 75ccb6879a3a4710558b28491f19555eb15fe40f - + https://github.com/dotnet/emsdk - 0fe864fc71191ff4ee18e59ef0af2929ca367a11 + 75ccb6879a3a4710558b28491f19555eb15fe40f - + + https://github.com/dotnet/deployment-tools c3ad00ae84489071080a606f6a8e43c9a91a5cc2 diff --git a/eng/Versions.props b/eng/Versions.props index a12f89adf..b1a802496 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -200,15 +200,21 @@ 12.3.2372 16.0.1478 - 8.0.0-alpha.1.23077.4 - 8.0.0-alpha.1.23077.4 - 8.0.0-alpha.1.23077.4 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version) - - 8.0.0-alpha.1.23078.5 - 8.0.0-alpha.1.23078.5 - 8.0.0-alpha.1.23078.5 - $(MicrosoftNETWorkloadMonoToolchainCurrentManifest80100alpha1Version) + 8.0.0-preview.1.23081.2 + 8.0.0-preview.1.23081.2 + 8.0.0-preview.1.23081.2 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview1PackageVersion) + + $([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `^\d*[\.]\d*[\.]\d*(-[A-z]*[\.]*\d*)?`)) + + + $(MicrosoftNETCoreAppRefPackageVersion) + + $([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `^\d*[\.]\d*[\.]\d*(-[A-z]*[\.]*\d*)?`)) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index a8e35b60d..d9ac8514e 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -1,6 +1,5 @@ - 8.0.100-alpha.1 8.0.100 @@ -11,12 +10,12 @@ - - - - - - + + + + + + From 06a76c265d890a8a98bcdb1d2961005c885af1ab Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 31 Jan 2023 19:13:52 -0600 Subject: [PATCH 2/3] Bump emscripten versions to preview2 --- eng/Version.Details.xml | 27 ++++++--------------------- eng/Versions.props | 15 +++++---------- 2 files changed, 11 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 127a0fef5..a2d29dbf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -167,33 +167,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 75ccb6879a3a4710558b28491f19555eb15fe40f + 1d9df3320ccdb0bbc40a31314641e1100369745b - + https://github.com/dotnet/emsdk - 75ccb6879a3a4710558b28491f19555eb15fe40f + 1d9df3320ccdb0bbc40a31314641e1100369745b - + https://github.com/dotnet/emsdk - 75ccb6879a3a4710558b28491f19555eb15fe40f + 1d9df3320ccdb0bbc40a31314641e1100369745b - - https://github.com/dotnet/deployment-tools c3ad00ae84489071080a606f6a8e43c9a91a5cc2 diff --git a/eng/Versions.props b/eng/Versions.props index b1a802496..2c43ad712 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -200,21 +200,16 @@ 12.3.2372 16.0.1478 - 8.0.0-preview.1.23081.2 - 8.0.0-preview.1.23081.2 - 8.0.0-preview.1.23081.2 + 8.0.0-preview.2.23081.3 + 8.0.0-preview.2.23081.3 + 8.0.0-preview.2.23081.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview1PackageVersion) - $([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `^\d*[\.]\d*[\.]\d*(-[A-z]*[\.]*\d*)?`)) + 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) - $(MicrosoftNETCoreAppRefPackageVersion) - $([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `^\d*[\.]\d*[\.]\d*(-[A-z]*[\.]*\d*)?`)) + 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From d88682ad4fc92e8861fcc6264ec28d7b52225b41 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 31 Jan 2023 19:40:47 -0600 Subject: [PATCH 3/3] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c43ad712..ff877bd51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -203,7 +203,7 @@ 8.0.0-preview.2.23081.3 8.0.0-preview.2.23081.3 8.0.0-preview.2.23081.3 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview1PackageVersion) + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))