Skip to content

Commit f4a6e04

Browse files
twsouthwicktwsouthwick
authored
Update to .NET 9 SDK (dotnet#1826)
1 parent 6c03d71 commit f4a6e04

File tree

8 files changed

+38
-31
lines changed

8 files changed

+38
-31
lines changed

‎.editorconfig‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ dotnet_diagnostic.CA1054.severity = suggestion
8383
csharp_using_directive_placement = outside_namespace:silent
8484
csharp_prefer_simple_using_statement = true:suggestion
8585
csharp_prefer_braces = true:silent
86-
csharp_style_namespace_declarations = block_scoped:silent
86+
csharp_style_namespace_declarations = file_scoped:silent
8787
csharp_style_prefer_method_group_conversion = true:silent
8888
csharp_style_prefer_top_level_statements = true:silent
89-
csharp_style_expression_bodied_methods = false:silent
89+
csharp_style_expression_bodied_methods = when_on_single_line:silent
9090
csharp_style_expression_bodied_constructors = false:silent
9191
csharp_style_expression_bodied_operators = false:silent
9292
csharp_style_expression_bodied_properties = true:silent
@@ -97,6 +97,9 @@ csharp_style_expression_bodied_local_functions = false:silent
9797
csharp_indent_labels = one_less_than_current
9898
csharp_style_throw_expression = true:suggestion
9999

100+
# IDE0058: Expression value is never used
101+
dotnet_diagnostic.IDE0058.severity = suggestion
102+
100103
[*.{cs,vb}]
101104
#### Naming styles ####
102105

@@ -164,3 +167,6 @@ tab_width = 4
164167
indent_size = 4
165168
end_of_line = crlf
166169
dotnet_diagnostic.CA1043.severity = suggestion
170+
171+
# IDE0046: Convert to conditional expression
172+
dotnet_diagnostic.IDE0046.severity = suggestion

‎Directory.Build.targets‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
</PackageReference>
1414
<Reference Condition="$(IsFramework)" Include="WindowsBase" />
1515
</ItemGroup>
16-
<!-- The tool is used by default, but we don't want it to. It must be set in a target to ensure it is not overridden -->
17-
<Target Name="BeforeResGen" Condition=" '$(TargetFramework)' == 'net35' ">
18-
<PropertyGroup>
19-
<ResGenExecuteAsTool>false</ResGenExecuteAsTool>
20-
</PropertyGroup>
21-
</Target>
16+
17+
<!-- By default, the .NET 3.5 build will try to use the ResGen.exe included with .NET 3.5, but that doesn't work on .NET Core-->
18+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net35' ">
19+
<GenerateResourceMSBuildArchitecture>CurrentArchitecture</GenerateResourceMSBuildArchitecture>
20+
<GenerateResourceMSBuildRuntime>CurrentRuntime</GenerateResourceMSBuildRuntime>
21+
<ResGenExecuteAsTool>false</ResGenExecuteAsTool>
22+
</PropertyGroup>
23+
2224
<PropertyGroup>
2325
<IncludeFrameworkShims Condition=" '$(IncludeFrameworkShims)' == '' ">false</IncludeFrameworkShims>
2426
</PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
55
<PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
66
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
7-
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.8.0" />
7+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.11.0" />
88
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
99
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
10-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
10+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
1111
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.24219.2" />
1212
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
1313
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
1414
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1515
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
16-
<PackageVersion Include="NSubstitute" Version="5.1.0" />
17-
<PackageVersion Include="NuGet.Common" Version="6.11.0" />
18-
<PackageVersion Include="NuGet.Packaging" Version="6.11.0" />
19-
<PackageVersion Include="NuGet.Protocol" Version="6.11.0" />
20-
<PackageVersion Include="NuGet.Resolver" Version="6.10.0" />
16+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
17+
<PackageVersion Include="NuGet.Common" Version="6.12.1" />
18+
<PackageVersion Include="NuGet.Packaging" Version="6.12.1" />
19+
<PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
20+
<PackageVersion Include="NuGet.Resolver" Version="6.12.1" />
2121
<PackageVersion Include="ObjectLayoutInspector" Version="0.1.4" />
2222
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
2323
<PackageVersion Include="Svg" Version="3.4.7" />
@@ -26,9 +26,10 @@
2626
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
2727
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
2828
<PackageVersion Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
29+
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
2930
<PackageVersion Include="System.Xml.ReaderWriter" Version="4.3.1" />
3031
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
31-
<PackageVersion Include="xunit" Version="2.9.1" />
32-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
32+
<PackageVersion Include="xunit" Version="2.9.2" />
33+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
3334
</ItemGroup>
3435
</Project>

‎Open-XML-SDK.sln‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
CHANGELOG.md = CHANGELOG.md
1111
Directory.Build.props = Directory.Build.props
1212
Directory.Build.targets = Directory.Build.targets
13+
Directory.Packages.props = Directory.Packages.props
1314
GitVersion.yml = GitVersion.yml
1415
global.json = global.json
1516
LICENSE = LICENSE
@@ -212,13 +213,13 @@ Global
212213
{E04F2FB4-DBC6-46DC-857C-F0E89B42F385} = {3653266D-2C88-4487-8977-839CB3E78A0A}
213214
{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62} = {0782A132-968D-4BDD-911A-2C3074EAF886}
214215
{C5AE39F0-A152-471A-B90E-B8F4E94AA6C2} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
215-
{DE06FC2B-EABB-4535-BC73-C51A32B5AC01} = {C5AE39F0-A152-471A-B90E-B8F4E94AA6C2}
216-
{890B74DD-6316-4D56-B42A-5D66F10F88C6} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
216+
{DE06FC2B-EABB-4535-BC73-C51A32B5AC01} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
217+
{890B74DD-6316-4D56-B42A-5D66F10F88C6} = {C5AE39F0-A152-471A-B90E-B8F4E94AA6C2}
217218
{5DE9FB8F-A7C2-4038-A4A8-1622CDB6821A} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
218219
{F48B7D50-16CB-4BEF-A614-2DED9960AF09} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
219-
{C91489AB-FF14-4FAD-BA51-35371ADD7E1C} = {3653266D-2C88-4487-8977-839CB3E78A0A}
220-
{BB5DF535-E849-42AC-852A-A6D4815347C0} = {A4DF60EB-3AA5-48F0-B4D2-3F94B8E62F03}
221-
{5241BCF2-331D-428E-A9C4-F8DF92C8F726} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
220+
{C91489AB-FF14-4FAD-BA51-35371ADD7E1C} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
221+
{BB5DF535-E849-42AC-852A-A6D4815347C0} = {3653266D-2C88-4487-8977-839CB3E78A0A}
222+
{5241BCF2-331D-428E-A9C4-F8DF92C8F726} = {A4DF60EB-3AA5-48F0-B4D2-3F94B8E62F03}
222223
{3ECC7570-3501-479D-9CD9-64799C2AD149} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
223224
{BADAC0CC-F3E6-440E-B322-DA2B97625F26} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
224225
{8EE9F34E-EAA1-4F03-B388-8076CE44DD7B} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "9.0.100",
44
"rollForward": "feature"
55
}
66
}

‎src/DocumentFormat.OpenXml.Framework/XmlPath.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public XmlPath(OpenXmlPart part)
105105
return new XmlPath(part);
106106
}
107107

108-
private static string TryBuildXPath(Stack<OpenXmlElement> elements, [MaybeNullWhen(false)] out XmlNamespaceManager namespaces)
108+
private static string TryBuildXPath(Stack<OpenXmlElement> elements, out XmlNamespaceManager? namespaces)
109109
{
110110
if (elements.Count == 0)
111111
{

‎test/DocumentFormat.OpenXml.Generator.Tests/DocumentFormat.OpenXml.Generator.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Include="Microsoft.CodeAnalysis" />
8-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" />
8+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" />
99
<PackageReference Include="NuGet.Common" />
1010
<PackageReference Include="NuGet.Packaging" />
1111
<PackageReference Include="NuGet.Protocol" />
1212
<PackageReference Include="NuGet.Resolver" />
13+
<PackageReference Include="System.Text.Json" />
1314
</ItemGroup>
1415
<ItemGroup>
1516
<ProjectReference Include="..\..\gen\DocumentFormat.OpenXml.Generator\DocumentFormat.OpenXml.Generator.csproj" />

‎test/DocumentFormat.OpenXml.Generator.Tests/Verifiers/OpenXmlIncrementalSourceGeneratorVerifier.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using Microsoft.CodeAnalysis.CSharp;
66
using Microsoft.CodeAnalysis.CSharp.Testing;
77
using Microsoft.CodeAnalysis.Testing;
8-
using Microsoft.CodeAnalysis.Testing.Verifiers;
98
using System;
109
using System.Collections.Generic;
1110
using System.Collections.Immutable;
@@ -15,7 +14,7 @@ namespace DocumentFormat.OpenXml.Generator.Tests.Verifiers
1514
public static partial class OpenXmlIncrementalSourceGeneratorVerifier<TSourceGenerator>
1615
where TSourceGenerator : IIncrementalGenerator, new()
1716
{
18-
public class Test : CSharpSourceGeneratorTest<EmptySourceGeneratorProvider, XUnitVerifier>
17+
public class Test : CSharpSourceGeneratorTest<EmptySourceGeneratorProvider, DefaultVerifier>
1918
{
2019
private static ImmutableDictionary<string, ReportDiagnostic> NullableWarnings { get; } = GetNullableWarningsFromCompiler();
2120

@@ -25,10 +24,7 @@ public Test()
2524

2625
public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.Default;
2726

28-
protected override IEnumerable<ISourceGenerator> GetSourceGenerators()
29-
{
30-
yield return new TSourceGenerator().AsSourceGenerator();
31-
}
27+
protected override IEnumerable<Type> GetSourceGenerators() => new[] { typeof(TSourceGenerator) };
3228

3329
protected override CompilationOptions CreateCompilationOptions()
3430
{

0 commit comments

Comments
 (0)