Skip to content

Commit

Permalink
[EngSys] .NET 9 SDK
Browse files Browse the repository at this point in the history
The focus of these changes is to move the repository global SDK version to
.NET 9 and include it in the test matrix.  The .NET tools (such as snippet generator)
are moving from .NET 6 to .NET 8 so that we're not running on an unsupported platform.
  • Loading branch information
jsquire committed Dec 12, 2024
1 parent 17fa4ac commit 4862899
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"Azure.Sdk.Tools.SnippetGenerator": {
"version": "1.0.0-dev.20230124.1",
"version": "1.0.0-dev.20241212.1",
"commands": [
"snippet-generator"
]
Expand Down
7 changes: 6 additions & 1 deletion eng/Packages.Data.props
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@
<PackageReference Update="NUnit" Version="3.13.2" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.Contains('CloudMachine'))">
<PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Update="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
</ItemGroup>

<!--
Dependency versions for Track 2, Microsoft.* libraries.
These are dependencies for Track 2 integration packages
Expand Down Expand Up @@ -409,7 +414,7 @@
</ItemGroup>

<PropertyGroup>
<TestProxyVersion>1.0.0-dev.20241101.1</TestProxyVersion>
<TestProxyVersion>1.0.0-dev.20241209.1</TestProxyVersion>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion eng/common/testproxy/target_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0-dev.20241101.1
1.0.0-dev.20241209.1
7 changes: 7 additions & 0 deletions eng/emitter-package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions eng/emitter-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"@azure-tools/typespec-azure-resource-manager": "0.48.0",
"@azure-tools/typespec-azure-rulesets": "0.48.0",
"@azure-tools/typespec-client-generator-core": "0.48.1",
"@azure-tools/typespec-liftr-base": "0.6.0",
"@typespec/compiler": "0.62.0",
"@typespec/http": "0.62.0",
"@typespec/openapi": "0.62.0",
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/templates/stages/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
},
"matrix": {
"Agent": {
"Ubuntu-20.04_NET6.0": {
"Ubuntu-20.04_NET9.0": {
"OSVmImage": "env:LINUXVMIMAGE",
"Pool": "env:LINUXPOOL",
"TestTargetFramework": "net6.0"
"TestTargetFramework": "net9.0"
},
"Ubuntu-20.04_NET8.0": {
"OSVmImage": "env:LINUXVMIMAGE",
Expand All @@ -25,10 +25,10 @@
"Pool": "env:WINDOWSPOOL",
"TestTargetFramework": "net8.0"
},
"MacOS_NET6.0": {
"MacOS_NET9.0": {
"OSVmImage": "env:MACVMIMAGE",
"Pool": "env:MACPOOL",
"TestTargetFramework": "net6.0"
"TestTargetFramework": "net9.0"
},
"MacOS_NET8.0": {
"OSVmImage": "env:MACVMIMAGE",
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/steps/install-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ steps:
inputs:
useGlobalJson: true
performMultiLevelLookup: true
- task: UseDotNet@2 # We need .NET 6 for azure-sdk-tools and the .NET 6 tests
- task: UseDotNet@2 # We need .NET for the .NET 9 tests
condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT')) # Windows supports MultiLevelLookup and doesn't need explicit framework installation
displayName: 'Use .NET 6.0 SDK'
displayName: 'Use .NET 9.0 SDK'
retryCountOnTaskFailure: 3
inputs:
# AspNetCore runtime pack can't be installed outside of SDK and we need it for integration tests
packageType: sdk
performMultiLevelLookup: true
version: "6.0.x"
version: "9.0.x"
- task: Cache@2
inputs:
key: 'nuget | "$(Agent.OS)" | $(Build.SourcesDirectory)/eng/Packages.Data.props | ${{parameters.NuGetCacheKey}}'
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/automation/GenerateAndBuildLib.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ function RegisterMgmtSDKToMgmtCoreClient () {
param(
[string]$packagesPath
)
$track2MgmtDirs = Get-ChildItem -Path "$packagesPath" -Directory -Recurse -Depth 1 | Where-Object { $_.Name -match "(Azure.ResourceManager.)" -and $(Test-Path("$($_.FullName)/src")) }
$track2MgmtDirs = Get-ChildItem -Path "$packagesPath" -Directory -Recurse -Depth 1 | Where-Object { $_.Name -match "(Azure.ResourceManager.)" -and $(Test-Path("$($_.FullName)/src")) } | Sort-Object -Property { (Split-Path $_.FullName -Parent) }
Write-Host "Updating mgmt core client ci.mgmt.yml"
#add path for each mgmt library into Azure.ResourceManager
$armCiFile = "$packagesPath/resourcemanager/ci.mgmt.yml"
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Microsoft.Build.Traversal": "3.2.0"
},
"sdk": {
"version": "8.0.100",
"version": "9.0.101",
"rollForward": "feature"
}
}

0 comments on commit 4862899

Please sign in to comment.