Skip to content

Commit a50367f

Browse files
committed
chore: Update to .NET 8 SDK
1 parent 1d15728 commit a50367f

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
with:
1212
submodules: true
1313

14-
- name: Setup .NET 6
14+
- name: Setup .NET
1515
uses: actions/setup-dotnet@v4
16-
with:
17-
dotnet-version: 6.0.x
16+
with:
17+
dotnet-version: 8.0.x
1818

1919
- name: Build and test
2020
run: |

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
<PropertyGroup>
44
<!--
5-
- Target net6.0 for everything, even if netstandard2.1 would
5+
- Target net8.0 for everything, even if netstandard2.1 would
66
- be fine for library projects.
77
-->
8-
<TargetFramework>net6.0</TargetFramework>
8+
<TargetFramework>net8.0</TargetFramework>
99

1010
<!-- Common build properties -->
1111
<LangVersion>latest</LangVersion>

Google.Api.Generator.Tests/ProtoTests/PackageApiMetadata.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
using gaxgrpc = Google.Api.Gax.Grpc;
16-
using gpr = Google.Protobuf.Reflection;
17-
using scg = System.Collections.Generic;
15+
using GAXGPRC = Google.Api.Gax.Grpc;
16+
using GPR = Google.Protobuf.Reflection;
17+
using SCG = System.Collections.Generic;
1818

1919
// This is a "fallback" API descriptor class, effectively: all the proto tests (other than Showcase)
2020
// use a namespace under "Testing." so this is always valid; if a "real" PackageApiMetadata is present
@@ -25,10 +25,10 @@ namespace Testing
2525
/// <summary>Static class to provide common access to package-wide API metadata.</summary>
2626
internal static class PackageApiMetadata
2727
{
28-
/// <summary>The <see cref="gaxgrpc::ApiMetadata"/> for services in this package.</summary>
29-
internal static gaxgrpc::ApiMetadata ApiMetadata { get; } = new gaxgrpc::ApiMetadata("Testing (fallback)", GetFileDescriptors);
28+
/// <summary>The <see cref="GAXGPRC::ApiMetadata"/> for services in this package.</summary>
29+
internal static GAXGPRC::ApiMetadata ApiMetadata { get; } = new GAXGPRC::ApiMetadata("Testing (fallback)", GetFileDescriptors);
3030

31-
private static scg::IEnumerable<gpr::FileDescriptor> GetFileDescriptors()
31+
private static SCG::IEnumerable<GPR::FileDescriptor> GetFileDescriptors()
3232
{
3333
yield break;
3434
}

Google.Api.Generator.Utils.Tests/Formatting/WhitespaceFormatterTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
using System.Runtime.CompilerServices;
3838
using System.Threading.Tasks;
3939
using Xunit;
40-
using sys = System;
40+
using SYS = System;
4141

4242
namespace Google.Api.Generator.Utils.Formatting.Tests
4343
{
@@ -46,7 +46,7 @@ public class WhitespaceFormatterTest
4646
{
4747
// Test nested class; base-list with multiple items.
4848
// Test aliased type.
49-
private class Inner : List<sys::String>, IEnumerable<string>, IList<string>
49+
private class Inner : List<SYS::String>, IEnumerable<string>, IList<string>
5050
{
5151
// Test ctor with no parameters.
5252
// Test ctor calling another ctor with multiple parameters.
@@ -292,9 +292,9 @@ public int Switch(int i)
292292
}
293293

294294
// Test aliasing of parameter and local
295-
public void AliasedLocal(sys::Exception e)
295+
public void AliasedLocal(SYS::Exception e)
296296
{
297-
sys::Exception e2 = e;
297+
SYS::Exception e2 = e;
298298
throw e2;
299299
}
300300
}

Google.Api.Generator/Generation/PackageApiMetadataGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
using static Google.Api.Generator.Utils.Roslyn.Modifier;
3030
using static Google.Api.Generator.Utils.Roslyn.RoslynBuilder;
3131
using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
32-
using iam = Google.Cloud.Iam.V1;
32+
using IAM = Google.Cloud.Iam.V1;
3333

3434
namespace Google.Api.Generator.Generation
3535
{
@@ -42,7 +42,7 @@ internal class PackageApiMetadataGenerator
4242
private static readonly Dictionary<string, FileDescriptor[]> MixinToFileDescriptors = new Dictionary<string, FileDescriptor[]>
4343
{
4444
{ Operations.Descriptor.FullName, new[] { OperationsReflection.Descriptor } },
45-
{ iam::IAMPolicy.Descriptor.FullName, new[] { iam::PolicyReflection.Descriptor, iam::IamPolicyReflection.Descriptor, iam::OptionsReflection.Descriptor } },
45+
{ IAM::IAMPolicy.Descriptor.FullName, new[] { IAM::PolicyReflection.Descriptor, IAM::IamPolicyReflection.Descriptor, IAM::OptionsReflection.Descriptor } },
4646
{ Locations.Descriptor.FullName, new[] { LocationsReflection.Descriptor } }
4747
};
4848

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": "6.0.414",
3+
"version": "8.0.410",
44
"allowPrerelease": false,
55
"rollForward": "latestMinor"
66
}

0 commit comments

Comments
 (0)