Undo 10.0 sdk workarounds and re-enable source-build legs (#44937)

dotnet · Nov 19, 2024 · a411655 · a411655
1 parent e55edec
commit a411655
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 40 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -293,15 +293,13 @@ extends:
               runTests: false
 
       ############### SOURCE BUILD ###############
-      # Temporarily removed until the SDK can target net10. The assets produced by upstream repos
-      # are net10, but this repo needs net9.
-      # - template: /eng/common/templates-official/job/source-build.yml@self
-      #   parameters:
-      #     platform:
-      #       name: Managed
-      #       container: centosStream9
-      #       jobProperties:
-      #         timeoutInMinutes: 30
+      - template: /eng/common/templates-official/job/source-build.yml@self
+        parameters:
+          platform:
+            name: Managed
+            container: centosStream9
+            jobProperties:
+              timeoutInMinutes: 30
 
       ############### DOTNET-FORMAT ###############
       - ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:

diff --git a/.vsts-pr.yml b/.vsts-pr.yml
@@ -65,15 +65,13 @@ stages:
       helixTargetQueue: osx.13.amd64.open
 
   ############### SOURCE BUILD ###############
-  # Temporarily removed until the SDK can target net10. The assets produced by upstream repos
-  # are net10, but this repo needs net9.
-  # - template: /eng/common/templates-official/job/source-build.yml@self
-  #   parameters:
-  #     platform:
-  #       name: Managed
-  #       container: centosStream9
-  #       jobProperties:
-  #         timeoutInMinutes: 30
+  - template: /eng/common/templates/job/source-build.yml@self
+    parameters:
+      platform:
+        name: Managed
+        container: centosStream9
+        jobProperties:
+          timeoutInMinutes: 30
 
   ############### DOTNET-FORMAT ###############
   - template: /eng/dotnet-format/dotnet-format-integration.yml
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -37,6 +37,7 @@
     <SdkTargetFramework>net10.0</SdkTargetFramework>
     <!-- TODO: Remove when Arcade updated NetCurrent to net10.0. -->
     <NetCurrent>net10.0</NetCurrent>
+    <NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetToolMinimum>
     <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
     <VisualStudioServiceTargetFramework>net8.0</VisualStudioServiceTargetFramework>
 

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -135,17 +135,13 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
     </Dependency>
-    <!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
-         See https://github.com/dotnet/sdk/issues/42920. -->
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-rc.2.24474.3" Pinned="true">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24563.16">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>280c613963a1768b810d09f32c998fe4490855e9</Sha>
+      <Sha>eb68e016a554b4da50d7fb0aeffe897cfabf36c7</Sha>
     </Dependency>
-    <!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
-         See https://github.com/dotnet/sdk/issues/42920. -->
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24474.3" Pinned="true">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.24563.16">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>280c613963a1768b810d09f32c998fe4490855e9</Sha>
+      <Sha>eb68e016a554b4da50d7fb0aeffe897cfabf36c7</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.12.1-rc.1">
       <Uri>https://github.com/nuget/nuget.client</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -233,12 +233,12 @@
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
     <MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
     <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
     <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
     <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
     <MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreTestHostPackageVersion>
+    <MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreTestHostPackageVersion>
     <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
     <VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24568.8</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>

diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj
@@ -18,9 +18,7 @@
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <RepositoryReference Include="roslyn" />
-    <!-- Dependency temporarily removed while transitioning to net10.
-         See https://github.com/dotnet/sdk/issues/42920. -->
-    <!-- <RepositoryReference Include="runtime" /> -->
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>
 

diff --git a/src/SourceBuild/content/repo-projects/nuget-client.proj b/src/SourceBuild/content/repo-projects/nuget-client.proj
@@ -20,9 +20,7 @@
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <RepositoryReference Include="msbuild" />
-    <!-- Dependency temporarily removed while transitioning to net10.
-         See https://github.com/dotnet/sdk/issues/42920. -->
-    <!-- <RepositoryReference Include="runtime" /> -->
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" />
     <RepositoryReference Include="xdt" />
   </ItemGroup>

diff --git a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
@@ -11,9 +11,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
-    <!-- Dependency temporarily removed while transitioning to net10.
-         See https://github.com/dotnet/sdk/issues/42920. -->
-    <!-- <RepositoryReference Include="runtime" /> -->
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" />
     <RepositoryReference Include="source-build-reference-packages" />
   </ItemGroup>

diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj
@@ -37,9 +37,7 @@
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
     <RepositoryReference Include="roslyn-analyzers" />
-    <!-- Dependency temporarily removed while transitioning to net10.
-         See https://github.com/dotnet/sdk/issues/42920. -->
-    <!-- <RepositoryReference Include="runtime" /> -->
+    <RepositoryReference Include="runtime" />
     <RepositoryReference Include="source-build-externals" />
     <RepositoryReference Include="source-build-reference-packages" />
     <RepositoryReference Include="symreader" />