Skip to content

Commit b6ede04

Browse files
joperezrradical
joperezr
and
radical
authored
Update to .NET 10 SDK and Arcade 10 (#10075)
* Update to .NET 10 SDK and Arcade 10 * Update workflows to instal 10 sdk as well * Use latest released preview of the sdk instead * Add all necessary runtimes for template tests. * Update tests for net10 now that targeting that from templates is supported. * Update the testSummary project so that it also tagets net10 * Adding sign info for js files * Add dotnet10 to the helix payload * Fix playground tests build on helix `AzureFunctionsEndToEnd.AppHost.csproj : error NU1010: The following PackageReference items do not define a corresponding PackageVersion item: Aspire.Hosting.Azure.AppContainers. Projects using Central Package Management must declare PackageReference and PackageVersion items with matching names. For more information, visit https://aka.ms/nuget/cpm/gettingstarted ` * Fix versions for current sdk to use 9.0 instead of 10.0, and revert the corresponding test change * [tests] Add properties to control filtering tests * fix md linter * Fix race on windows * address review feedback from @ joperezr --------- Co-authored-by: Ankit Jain <[email protected]>
1 parent 9a6206a commit b6ede04

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1780
-526
lines changed

‎.github/actions/enumerate-tests/action.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ runs:
2828
with:
2929
dotnet-version: |
3030
9.x
31+
10.x
3132
3233
- name: Get list of integration tests
3334
if: ${{ inputs.includeIntegrations }}

‎.github/workflows/run-tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ jobs:
8383
dotnet-version: |
8484
8.x
8585
9.x
86+
10.x
8687
8788
- name: Trust HTTPS development certificate (Linux)
8889
if: inputs.os == 'ubuntu-latest'

‎.github/workflows/update-dependencies.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1818

19-
- name: Setup .NET 9
19+
- name: Setup .NET 10
2020
uses: actions/setup-dotnet@b2ace4b12f4cec1b96b6361ff2694ba9e931ceb4 # v3.3.1
2121
with:
22-
dotnet-version: "9.0.x"
22+
dotnet-version: "10.0.x"
2323

2424
- name: Restore solution
2525
run: ./build.sh -restore

‎NuGet.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1616
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1717
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
18+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
1819
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
1920
<add key="dotnet9-transport" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
2021
</packageSources>
@@ -31,6 +32,9 @@
3132
<packageSource key="dotnet9">
3233
<package pattern="*" />
3334
</packageSource>
35+
<packageSource key="dotnet10">
36+
<package pattern="*" />
37+
</packageSource>
3438
<packageSource key="dotnet-libraries">
3539
<package pattern="Microsoft.DeveloperControlPlane*" />
3640
<package pattern="System.CommandLine" />

‎eng/Signing.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<ItemGroup>
44
<FileExtensionSignInfo Update=".nupkg" CertificateName="NuGet" />
55
<FileExtensionSignInfo Update=".zip" CertificateName="None" />
6+
<FileExtensionSignInfo Update=".js" CertificateName="MicrosoftDotNet500" />
67

78
<!-- add missing entry for .msi, this can be removed once aspire uses arcade 10.0 -->
89
<FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" Condition="!@(FileExtensionSignInfo->AnyHaveMetadataValue('Identity', '.msi'))" />
@@ -34,6 +35,10 @@
3435
<FileSignInfo Include="Semver.dll" CertificateName="3PartySHA2" />
3536
</ItemGroup>
3637

38+
<PropertyGroup>
39+
<NoSignJS>true</NoSignJS>
40+
</PropertyGroup>
41+
3742
<ItemGroup>
3843
<ItemsToSign Include="$(VisualStudioSetupInsertionPath)\**\*.msi" Condition="'$(PostBuildSign)' != 'true'" />
3944
<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.wixpack.zip" Condition="'$(PostBuildSign)' != 'true'" />

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -153,33 +153,33 @@
153153
</Dependency>
154154
</ProductDependencies>
155155
<ToolsetDependencies>
156-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
156+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25325.3">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
158+
<Sha>f70d32d77df8544117bd659512a9087619c1de6e</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.25325.4">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25325.3">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
162+
<Sha>f70d32d77df8544117bd659512a9087619c1de6e</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25325.4">
164+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25325.3">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
166+
<Sha>f70d32d77df8544117bd659512a9087619c1de6e</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.25325.4">
168+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25325.3">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
170+
<Sha>f70d32d77df8544117bd659512a9087619c1de6e</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.25325.4">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25325.3">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
174+
<Sha>f70d32d77df8544117bd659512a9087619c1de6e</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25178.1">
176+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="10.0.0-beta.25325.3">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>4bb78555b1275bc6cb21f6d61f7de60b0605edc3</Sha>
178+
<Sha>f70d32d77df8544117bd659512a9087619c1de6e</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25325.4">
180+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25325.3">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
182+
<Sha>f70d32d77df8544117bd659512a9087619c1de6e</Sha>
183183
</Dependency>
184184
<!-- Intermediate is necessary for source build. -->
185185
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25325.4">

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<DefaultTargetFramework>net8.0</DefaultTargetFramework>
1010
<AllTargetFrameworks>$(DefaultTargetFramework);net9.0</AllTargetFrameworks>
1111
<!-- dotnet versions for running tests -->
12-
<DotNetRuntimePreviousVersionForTesting>8.0.13</DotNetRuntimePreviousVersionForTesting>
12+
<DotNetRuntimePreviousVersionForTesting>8.0.17</DotNetRuntimePreviousVersionForTesting>
1313
<DotNetRuntimeCurrentVersionForTesting>9.0.6</DotNetRuntimeCurrentVersionForTesting>
1414
<!-- dotnet 8.0 versions for running tests - used for templates tests -->
1515
<DotNetSdkPreviousVersionForTesting>8.0.406</DotNetSdkPreviousVersionForTesting>
1616
<!-- dotnet 10.0 versions for running tests - used for templates tests -->
17-
<DotNetSdkNextVersionForTesting>10.0.100-preview.5.25277.114</DotNetSdkNextVersionForTesting>
17+
<DotNetSdkCurrentVersionForTesting>9.0.200</DotNetSdkCurrentVersionForTesting>
1818
<XunitV3Version>3.0.0-pre.25</XunitV3Version>
1919
<XUnitAnalyzersVersion>1.21.0</XUnitAnalyzersVersion>
2020
<XunitRunnerVisualStudioVersion>3.1.0</XunitRunnerVisualStudioVersion>
@@ -37,9 +37,9 @@
3737
<MicrosoftDeveloperControlPlanewindowsamd64Version>0.15.13</MicrosoftDeveloperControlPlanewindowsamd64Version>
3838
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.15.13</MicrosoftDeveloperControlPlanewindowsarm64Version>
3939
<!-- Other -->
40-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.25325.4</MicrosoftDotNetRemoteExecutorVersion>
41-
<MicrosoftDotNetXUnitV3ExtensionsVersion>10.0.0-beta.25178.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
42-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksArchivesVersion>
40+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25325.3</MicrosoftDotNetRemoteExecutorVersion>
41+
<MicrosoftDotNetXUnitV3ExtensionsVersion>10.0.0-beta.25325.3</MicrosoftDotNetXUnitV3ExtensionsVersion>
42+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25325.3</MicrosoftDotNetBuildTasksArchivesVersion>
4343
<!-- dotnet/extensions -->
4444
<MicrosoftExtensionsAIVersion>9.5.0</MicrosoftExtensionsAIVersion>
4545
<MicrosoftExtensionsAIPreviewVersion>9.5.0-preview.1.25265.7</MicrosoftExtensionsAIPreviewVersion>

‎eng/clipack/Common.projitems‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@
3131
<AdditionalProperties Include="PublishAot=false" />
3232
<AdditionalProperties Include="PublishSingleFile=true" />
3333
<AdditionalProperties Include="SelfContained=true" />
34+
35+
<!-- Windows pdb aren't really needed any more. See https://github.com/dotnet/arcade/issues/15724
36+
As the pdb file is in the same location for all the RIDs it causes arcade's `_DeployPortableSymbolsToSymStore`
37+
target to race.
38+
39+
`The process cannot access the file 'D:\a\_work\1\s\artifacts\SymStore\Release\Aspire.Cli\net8.0\aspire.pdb' because it is being used by another process`
40+
-->
41+
<AdditionalProperties Include="PublishWindowsPdb=false" />
3442
</ItemGroup>
3543

3644
<!-- Remove OutputPath, and TargetFramework so the defaults can be used -->

‎eng/common/CIBuild.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"

‎eng/common/build.ps1‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10+
[switch] $buildCheck = $false,
1011
[switch][Alias('r')]$restore,
1112
[switch] $deployDeps,
1213
[switch][Alias('b')]$build,
@@ -20,6 +21,7 @@ Param(
2021
[switch] $publish,
2122
[switch] $clean,
2223
[switch][Alias('pb')]$productBuild,
24+
[switch]$fromVMR,
2325
[switch][Alias('bl')]$binaryLog,
2426
[switch][Alias('nobl')]$excludeCIBinarylog,
2527
[switch] $ci,
@@ -71,6 +73,9 @@ function Print-Usage() {
7173
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7274
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7375
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
76+
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
77+
Write-Host " -buildCheck Sets /check msbuild parameter"
78+
Write-Host " -fromVMR Set when building from within the VMR"
7479
Write-Host ""
7580

7681
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -97,6 +102,7 @@ function Build {
97102

98103
$bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' }
99104
$platformArg = if ($platform) { "/p:Platform=$platform" } else { '' }
105+
$check = if ($buildCheck) { '/check' } else { '' }
100106

101107
if ($projects) {
102108
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
@@ -113,6 +119,7 @@ function Build {
113119
MSBuild $toolsetBuildProj `
114120
$bl `
115121
$platformArg `
122+
$check `
116123
/p:Configuration=$configuration `
117124
/p:RepoRoot=$RepoRoot `
118125
/p:Restore=$restore `
@@ -122,11 +129,13 @@ function Build {
122129
/p:Deploy=$deploy `
123130
/p:Test=$test `
124131
/p:Pack=$pack `
125-
/p:DotNetBuildRepo=$productBuild `
132+
/p:DotNetBuild=$productBuild `
133+
/p:DotNetBuildFromVMR=$fromVMR `
126134
/p:IntegrationTest=$integrationTest `
127135
/p:PerformanceTest=$performanceTest `
128136
/p:Sign=$sign `
129137
/p:Publish=$publish `
138+
/p:RestoreStaticGraphEnableBinaryLogger=$binaryLog `
130139
@properties
131140
}
132141

0 commit comments

Comments
 (0)