Skip to content

Commit ee89c99

Browse files
anthony-c-martinanthony-c-martin
authored
Migrate to .NET 9 (#109)
1 parent 53c29e7 commit ee89c99

27 files changed

+34
-1668
lines changed

‎.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"request": "launch",
88
"preLaunchTask": "build",
99
// If you have changed target frameworks, make sure to update the program path.
10-
"program": "${workspaceFolder}/src/TemplateRefGenerator/bin/Debug/net8.0/TemplateRefGenerator",
10+
"program": "${workspaceFolder}/src/TemplateRefGenerator/bin/Debug/net9.0/TemplateRefGenerator",
1111
"args": [
1212
"--source-folder",
1313
"../../../bicep-types-az/generated",
@@ -26,7 +26,7 @@
2626
"request": "launch",
2727
"preLaunchTask": "build",
2828
// If you have changed target frameworks, make sure to update the program path.
29-
"program": "${workspaceFolder}/src/TemplateRefGenerator/bin/Debug/net8.0/TemplateRefGenerator",
29+
"program": "${workspaceFolder}/src/TemplateRefGenerator/bin/Debug/net9.0/TemplateRefGenerator",
3030
"args": [
3131
"--source-folder",
3232
"../../../bicep-types-az/generated",

‎bicep-refdocs-generator.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplateRefGenerator", "src
99
EndProject
1010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplateRefGenerator.Tests", "src\TemplateRefGenerator.Tests\TemplateRefGenerator.Tests.csproj", "{F1E3688E-AD5C-4522-BE06-63C66FA14FBA}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestHelpers", "src\TestHelpers\TestHelpers.csproj", "{72190746-9FE8-4C33-84F8-AF7DBD90FF43}"
13-
EndProject
1412
Global
1513
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1614
Debug|Any CPU = Debug|Any CPU
@@ -28,14 +26,9 @@ Global
2826
{F1E3688E-AD5C-4522-BE06-63C66FA14FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
2927
{F1E3688E-AD5C-4522-BE06-63C66FA14FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
3028
{F1E3688E-AD5C-4522-BE06-63C66FA14FBA}.Release|Any CPU.Build.0 = Release|Any CPU
31-
{72190746-9FE8-4C33-84F8-AF7DBD90FF43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32-
{72190746-9FE8-4C33-84F8-AF7DBD90FF43}.Debug|Any CPU.Build.0 = Debug|Any CPU
33-
{72190746-9FE8-4C33-84F8-AF7DBD90FF43}.Release|Any CPU.ActiveCfg = Release|Any CPU
34-
{72190746-9FE8-4C33-84F8-AF7DBD90FF43}.Release|Any CPU.Build.0 = Release|Any CPU
3529
EndGlobalSection
3630
GlobalSection(NestedProjects) = preSolution
3731
{6E9D55F0-E48D-4969-BDF1-4122E4C7A0F3} = {B0F731E2-C7BD-42BF-AB6B-26186ABB0BA4}
3832
{F1E3688E-AD5C-4522-BE06-63C66FA14FBA} = {B0F731E2-C7BD-42BF-AB6B-26186ABB0BA4}
39-
{72190746-9FE8-4C33-84F8-AF7DBD90FF43} = {B0F731E2-C7BD-42BF-AB6B-26186ABB0BA4}
4033
EndGlobalSection
4134
EndGlobal

‎docs/dev_guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ Run `dotnet build` to build this project.
3636
After building the .NET solution, you can use the CLI by running:
3737

3838
```sh
39-
./src/TemplateRefGenerator/bin/Debug/net8.0/TemplateRefGenerator
39+
./src/TemplateRefGenerator/bin/Debug/net9.0/TemplateRefGenerator
4040
```
4141

4242
If you run this command without supplying any arguments, you will see a help message giving information on the supported arguments.
4343

4444
Here's an example of how you can run the CLI tool:
4545
```sh
46-
src/TemplateRefGenerator/bin/Debug/net8.0/TemplateRefGenerator --source-folder ../bicep-types-az/generated --output-folder ./generated
46+
src/TemplateRefGenerator/bin/Debug/net9.0/TemplateRefGenerator --source-folder ../bicep-types-az/generated --output-folder ./generated
4747
```
4848

4949
To get detailed logging, use the `--verbose` flag.

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
},
55
"sdk": {
66
"allowPrerelease": false,
7-
"version": "8.0.403",
7+
"version": "9.0.303",
88
"rollForward": "latestPatch"
99
}
1010
}

‎src/Directory.Build.props

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,11 @@
44
<LangVersion>default</LangVersion>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7+
<TargetFramework>net9.0</TargetFramework>
78
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
8-
<!-- NU5104: A stable release of a package should not have a prerelease dependency -->
99
<NoWarn>$(NoWarn);NU5104</NoWarn>
1010
<EnableNETAnalyzers>true</EnableNETAnalyzers>
1111
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
12-
<!-- Bubble up all unused usings https://github.com/dotnet/roslyn/issues/41640#issuecomment-985780130 -->
1312
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
15-
<RestoreLockedMode Condition="'$(CI)' == 'true'">true</RestoreLockedMode>
16-
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
17-
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
18-
<!-- disable nuget packing on all projects by default -->
19-
<IsPackable>false</IsPackable>
2013
</PropertyGroup>
21-
22-
<ItemGroup>
23-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" PrivateAssets="All" />
24-
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" PrivateAssets="All" />
25-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
26-
</ItemGroup>
2714
</Project>

‎src/Directory.Packages.props

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" PrivateAssets="All" />
8+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
9+
</ItemGroup>
10+
<ItemGroup>
11+
<PackageVersion Include="Azure.Bicep.Types" Version="0.5.110" />
12+
<PackageVersion Include="Azure.Bicep.Types.Az" Version="0.2.727" />
13+
<PackageVersion Include="Azure.Deployments.Testing.Utilities" Version="1.473.0" />
14+
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
15+
<PackageVersion Include="MSTest" Version="3.10.2" />
16+
<PackageVersion Include="System.IO.Abstractions" Version="22.0.14" />
17+
</ItemGroup>
18+
</Project>

‎src/TemplateRefGenerator.Tests/AllVersionsGeneratorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
using System.Diagnostics.CodeAnalysis;
88
using System.Linq;
99
using Azure.Bicep.Types.Az;
10+
using Azure.Deployments.Testing.Utilities;
1011
using FluentAssertions;
1112
using Microsoft.VisualStudio.TestTools.UnitTesting;
1213
using TemplateRefGenerator;
13-
using TestHelpers;
1414

1515
namespace TemplateRefGenerator.Tests;
1616
[TestClass]

‎src/TemplateRefGenerator.Tests/ChangeLogGeneratorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
using System.Diagnostics.CodeAnalysis;
88
using System.Linq;
99
using Azure.Bicep.Types.Az;
10+
using Azure.Deployments.Testing.Utilities;
1011
using FluentAssertions;
1112
using Microsoft.VisualStudio.TestTools.UnitTesting;
1213
using TemplateRefGenerator;
13-
using TestHelpers;
1414

1515
namespace TemplateRefGenerator.Tests;
1616
[TestClass]

‎src/TemplateRefGenerator.Tests/MarkdownGeneratorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
using System.Diagnostics.CodeAnalysis;
88
using System.Linq;
99
using Azure.Bicep.Types.Az;
10+
using Azure.Deployments.Testing.Utilities;
1011
using FluentAssertions;
1112
using Microsoft.VisualStudio.TestTools.UnitTesting;
1213
using TemplateRefGenerator;
13-
using TestHelpers;
1414

1515
namespace TemplateRefGenerator.Tests;
1616
[TestClass]

‎src/TemplateRefGenerator.Tests/TemplateRefGenerator.Tests.csproj

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Nullable>Enable</Nullable>
4-
<TargetFramework>net8.0</TargetFramework>
53
<EnableMSTestRunner>true</EnableMSTestRunner>
64
<!-- More info about dotnet test integration https://learn.microsoft.com/dotnet/core/testing/unit-testing-platform-integration-dotnet-test -->
75
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
@@ -14,14 +12,11 @@
1412
</ItemGroup>
1513

1614
<ItemGroup>
17-
<PackageReference Include="FluentAssertions" Version="7.0.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
19-
<PackageReference Include="MSTest" Version="3.10.2" />
20-
<PackageReference Include="Azure.Bicep.Types.Az" Version="0.2.727" />
15+
<PackageReference Include="MSTest" />
16+
<PackageReference Include="Azure.Bicep.Types.Az" />
2117
</ItemGroup>
2218

2319
<ItemGroup>
2420
<ProjectReference Include="../TemplateRefGenerator/TemplateRefGenerator.csproj" />
25-
<ProjectReference Include="../TestHelpers/TestHelpers.csproj" />
2621
</ItemGroup>
2722
</Project>

0 commit comments

Comments
 (0)