Depend on Microsoft.NET.Sdk (#4851)

diff --git a/eng/InstallRuntimes.proj b/eng/InstallRuntimes.proj
index c1f1f884b3f8cebad70dc128cce639a905967351..0c67ad6fa613e4ca4e5446a5497dafc850c6664e 100644 (file)
--- a/eng/InstallRuntimes.proj
+++ b/eng/InstallRuntimes.proj
@@ -5,9 +5,9 @@
 
     From Versions.props:
 
-    $(MicrosoftDotnetSdkInternalVersion) - .NET SDK to use for testing
+    $(MicrosoftDotnetSdkVersion) - .NET SDK to use for testing
     $(InternalReleaseTesting) - if true, internal service release testing
-    $(PrivateBuildTesting) - if true, test against a locally built runtime 
+    $(PrivateBuildTesting) - if true, test against a locally built runtime
     @(RuntimeTestVersions) - runtime/aspnetcore versions to install and test against
 
     From Arcade:
@@ -56,7 +56,7 @@
     Installs the runtimes for the SOS tests, handles private runtime build support or cleans up the private build registry keys
 -->
 
-  <Target Name="InstallTestRuntimes" 
+  <Target Name="InstallTestRuntimes"
           DependsOnTargets="CleanupVersionManifest;InstallRuntimesWindows;InstallRuntimesUnix;WriteTestVersionManifest;" />
 
 <!--
@@ -67,7 +67,7 @@
           Condition="$([MSBuild]::IsOsPlatform(Windows))"
           Inputs="$(VersionsPropsPath)" Outputs="$(TestConfigFileName)">
 
-    <Exec Command="$(PowershellWrapper) &quot;&amp; { &amp;$(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftDotnetSdkInternalVersion) }&quot;"
+    <Exec Command="$(PowershellWrapper) &quot;&amp; { &amp;$(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftDotnetSdkVersion) }&quot;"
           IgnoreStandardErrorWarningFormat="true" />
 
     <Exec Command="$(PowershellWrapper) &quot;&amp; { &amp;$(DotnetInstallScriptCmd) $(CommonInstallArgs) %(RuntimeTestVersions.ExtraInstallArgs) -Version %(RuntimeTestVersions.RuntimeDownload) -Runtime dotnet }&quot;"
@@ -85,7 +85,7 @@
           Condition="!$([MSBuild]::IsOsPlatform(Windows))"
           Inputs="$(VersionsPropsPath)" Outputs="$(TestConfigFileName)">
 
-    <Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftDotnetSdkInternalVersion)"
+    <Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) -Version $(MicrosoftDotnetSdkVersion)"
           IgnoreStandardErrorWarningFormat="true" />
 
     <Exec Command="bash $(DotnetInstallScriptCmd) $(CommonInstallArgs) %(RuntimeTestVersions.ExtraInstallArgs) -Version %(RuntimeTestVersions.RuntimeDownload) -Runtime dotnet"
@@ -101,8 +101,8 @@
     Writes the Debugger.Tests.Versions.txt file used by the SOS test harness
 -->
 
-  <Target Name="WriteTestVersionManifest" 
-          Inputs="$(VersionsPropsPath)" 
+  <Target Name="WriteTestVersionManifest"
+          Inputs="$(VersionsPropsPath)"
           Outputs="$(TestConfigFileName)">
 
     <ItemGroup>
@@ -131,7 +131,7 @@
         </ConfigFileEntry>
       </TestConfigFileLines>
     </ItemGroup>
-    
+
     <WriteLinesToFile File="$(TestConfigFileName)" Lines="@(TestConfigFileLines->Metadata('ConfigFileEntry'))" Overwrite="true" WriteOnlyWhenDifferent="true" />
 
     <Message Importance="High" Text="Created config file $(TestConfigFileName)" />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 28c26c0b8c7805189586e8d66dfe8d5f2504baeb..f0e13f22b67bbc3658b2856971cc894ac460e9b0 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -28,9 +28,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.5.24253.16">
-      <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>fa261b952d702c6bd604728fcbdb58ac071a22b1</Sha>
+    <Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.1.24409.1">
+      <Uri>https://github.com/dotnet/sdk</Uri>
+      <Sha>43360291a50c9c7c471551f8f8363919d38014ea</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-rc.1.24411.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index c8dcbaaa2ef084365253c052a83d433e1c81f247..2b86f7464fa6339d2d124631f72573c4a77ddccf 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -22,7 +22,7 @@
     <MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-rc.1.24411.2</MicrosoftAspNetCoreAppRefInternalVersion>
     <MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.1.24411.2</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
-    <MicrosoftDotnetSdkInternalVersion>9.0.100-preview.5.24253.16</MicrosoftDotnetSdkInternalVersion>
+    <MicrosoftDotnetSdkVersion>9.0.100-rc.1.24409.1</MicrosoftDotnetSdkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Opt-in/out repo features -->