diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29f6777d7..c45eb9a73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,9 +174,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 225b08896a758167cf6b491f3369b0a1d366fc6c + 6736b00d7d23b40b8b6975439421cb2e41a781db https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e0aad65b5..7511801cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -113,7 +113,7 @@ 7.0.100-rc.1.22416.16 5.0.13 6.0.1 - 7.0.0-preview.7.22376.6 + 7.0.0-rc.1.22427.1 5.0.17-servicing.22215.4 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 @@ -140,9 +140,9 @@ 7.0.0-preview.7.22376.2 7.0.0-preview.7.22377.1 $(NUnit3DotNetNewTemplatePackageVersion) - 7.0.100-preview.7.22376.2 - 7.0.100-preview.7.22376.2 - 7.0.0-preview.7.22376.6 + 7.0.100-rc.1.22431.7 + 7.0.100-rc.1.22431.7 + 7.0.0-rc.1.22427.1 $(MicrosoftWinFormsProjectTemplates60PackageVersion) $(MicrosoftWPFProjectTemplates60PackageVersion) @@ -220,8 +220,8 @@ 12.3.303 15.4.303 $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.0-alpha.1.22417.1 - $(MicrosoftNETWorkloadEmscriptenManifest70100Version) + 8.0.0-alpha.1.22462.1 + $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) diff --git a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj index f99075302..9518a07d6 100644 --- a/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj +++ b/src/SourceBuild/Arcade/tools/TextOnlyPackages.csproj @@ -17,8 +17,11 @@ - - + + + + + @@ -53,9 +56,9 @@ - + Condition="!$([System.String]::new(%(BundledManifests.Identity)).StartsWith('Microsoft.NET.Workload.Mono.ToolChain')) and + !$([System.String]::new(%(BundledManifests.Identity)).StartsWith('Microsoft.NET.Workload.Emscripten'))" /> + diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 2b502b21d..ff55bfaec 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -77,12 +77,12 @@ <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) - <_NET70RuntimePackVersion>7.0.0-preview.7.22375.6 - <_NET70TargetingPackVersion>7.0.0-preview.7.22375.6 - <_WindowsDesktop70RuntimePackVersion>7.0.0-preview.7.22377.1 - <_WindowsDesktop70TargetingPackVersion>7.0.0-preview.7.22377.1 - <_AspNet70RuntimePackVersion>7.0.0-preview.7.22376.6 - <_AspNet70TargetingPackVersion>7.0.0-preview.7.22376.6 + <_NET70RuntimePackVersion>7.0.0-rc.1.22427.1 + <_NET70TargetingPackVersion>7.0.0-rc.1.22427.1 + <_WindowsDesktop70RuntimePackVersion>7.0.0-rc.1.22431.18 + <_WindowsDesktop70TargetingPackVersion>7.0.0-rc.1.22431.18 + <_AspNet70RuntimePackVersion>7.0.0-rc.1.22426.10 + <_AspNet70TargetingPackVersion>7.0.0-rc.1.22426.10 <_NET60RuntimePackVersion>6.0.$(VersionFeature60) <_NET60TargetingPackVersion>6.0.$(VersionFeature60) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index a45fd5c1a..69de3c47c 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -63,7 +63,7 @@ - +