Skip to content

Commit a411655

Browse files
ViktorHoferViktorHofer
authored
Undo 10.0 sdk workarounds and re-enable source-build legs (#44937)
1 parent e55edec commit a411655

File tree

9 files changed

+25
-40
lines changed

9 files changed

+25
-40
lines changed

‎.vsts-ci.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -293,15 +293,13 @@ extends:
293293
runTests: false
294294

295295
############### SOURCE BUILD ###############
296-
# Temporarily removed until the SDK can target net10. The assets produced by upstream repos
297-
# are net10, but this repo needs net9.
298-
# - template: /eng/common/templates-official/job/source-build.yml@self
299-
# parameters:
300-
# platform:
301-
# name: Managed
302-
# container: centosStream9
303-
# jobProperties:
304-
# timeoutInMinutes: 30
296+
- template: /eng/common/templates-official/job/source-build.yml@self
297+
parameters:
298+
platform:
299+
name: Managed
300+
container: centosStream9
301+
jobProperties:
302+
timeoutInMinutes: 30
305303

306304
############### DOTNET-FORMAT ###############
307305
- ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}:

‎.vsts-pr.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,13 @@ stages:
6565
helixTargetQueue: osx.13.amd64.open
6666

6767
############### SOURCE BUILD ###############
68-
# Temporarily removed until the SDK can target net10. The assets produced by upstream repos
69-
# are net10, but this repo needs net9.
70-
# - template: /eng/common/templates-official/job/source-build.yml@self
71-
# parameters:
72-
# platform:
73-
# name: Managed
74-
# container: centosStream9
75-
# jobProperties:
76-
# timeoutInMinutes: 30
68+
- template: /eng/common/templates/job/source-build.yml@self
69+
parameters:
70+
platform:
71+
name: Managed
72+
container: centosStream9
73+
jobProperties:
74+
timeoutInMinutes: 30
7775

7876
############### DOTNET-FORMAT ###############
7977
- template: /eng/dotnet-format/dotnet-format-integration.yml

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<SdkTargetFramework>net10.0</SdkTargetFramework>
3838
<!-- TODO: Remove when Arcade updated NetCurrent to net10.0. -->
3939
<NetCurrent>net10.0</NetCurrent>
40+
<NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetToolMinimum>
4041
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
4142
<VisualStudioServiceTargetFramework>net8.0</VisualStudioServiceTargetFramework>
4243

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,13 @@
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136136
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
137137
</Dependency>
138-
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
139-
See https://github.com/dotnet/sdk/issues/42920. -->
140-
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-rc.2.24474.3" Pinned="true">
138+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24563.16">
141139
<Uri>https://github.com/dotnet/aspnetcore</Uri>
142-
<Sha>280c613963a1768b810d09f32c998fe4490855e9</Sha>
140+
<Sha>eb68e016a554b4da50d7fb0aeffe897cfabf36c7</Sha>
143141
</Dependency>
144-
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
145-
See https://github.com/dotnet/sdk/issues/42920. -->
146-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.0-rc.2.24474.3" Pinned="true">
142+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.24563.16">
147143
<Uri>https://github.com/dotnet/aspnetcore</Uri>
148-
<Sha>280c613963a1768b810d09f32c998fe4490855e9</Sha>
144+
<Sha>eb68e016a554b4da50d7fb0aeffe897cfabf36c7</Sha>
149145
</Dependency>
150146
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.12.1-rc.1">
151147
<Uri>https://github.com/nuget/nuget.client</Uri>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,12 @@
233233
<PropertyGroup>
234234
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
235235
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreAppRefPackageVersion>
236-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
236+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
237237
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
238238
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
239239
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
240240
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreAnalyzersPackageVersion>
241-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreTestHostPackageVersion>
241+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreTestHostPackageVersion>
242242
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
243243
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24568.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
244244
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24568.8</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>

‎src/SourceBuild/content/repo-projects/msbuild.proj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818

1919
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
2020
<RepositoryReference Include="roslyn" />
21-
<!-- Dependency temporarily removed while transitioning to net10.
22-
See https://github.com/dotnet/sdk/issues/42920. -->
23-
<!-- <RepositoryReference Include="runtime" /> -->
21+
<RepositoryReference Include="runtime" />
2422
<RepositoryReference Include="source-build-reference-packages" />
2523
</ItemGroup>
2624

‎src/SourceBuild/content/repo-projects/nuget-client.proj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020

2121
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
2222
<RepositoryReference Include="msbuild" />
23-
<!-- Dependency temporarily removed while transitioning to net10.
24-
See https://github.com/dotnet/sdk/issues/42920. -->
25-
<!-- <RepositoryReference Include="runtime" /> -->
23+
<RepositoryReference Include="runtime" />
2624
<RepositoryReference Include="source-build-externals" />
2725
<RepositoryReference Include="xdt" />
2826
</ItemGroup>

‎src/SourceBuild/content/repo-projects/roslyn-analyzers.proj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
</ItemGroup>
1212

1313
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
14-
<!-- Dependency temporarily removed while transitioning to net10.
15-
See https://github.com/dotnet/sdk/issues/42920. -->
16-
<!-- <RepositoryReference Include="runtime" /> -->
14+
<RepositoryReference Include="runtime" />
1715
<RepositoryReference Include="source-build-externals" />
1816
<RepositoryReference Include="source-build-reference-packages" />
1917
</ItemGroup>

‎src/SourceBuild/content/repo-projects/roslyn.proj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@
3737

3838
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
3939
<RepositoryReference Include="roslyn-analyzers" />
40-
<!-- Dependency temporarily removed while transitioning to net10.
41-
See https://github.com/dotnet/sdk/issues/42920. -->
42-
<!-- <RepositoryReference Include="runtime" /> -->
40+
<RepositoryReference Include="runtime" />
4341
<RepositoryReference Include="source-build-externals" />
4442
<RepositoryReference Include="source-build-reference-packages" />
4543
<RepositoryReference Include="symreader" />

0 commit comments

Comments
 (0)