Skip to content

Commit

Permalink
Merge pull request #62 from GarageGroup/feature/use-net-9
Browse files Browse the repository at this point in the history
Use .NET9
  • Loading branch information
pmosk authored Nov 8, 2024
2 parents d77a1a3 + 0d6a848 commit 0d05ef4
Show file tree
Hide file tree
Showing 32 changed files with 103 additions and 96 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.100-preview.6.24328.19'

- name: Add Garage Group NuGet Source
run: >
Expand All @@ -32,4 +32,4 @@ jobs:
run: dotnet build --no-restore -c Release

- name: Test
run: dotnet test --no-restore -c Release
run: dotnet test --no-restore -c Release
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
dotnet-version: '9.0.100-preview.6.24328.19'

- name: Add Garage Group NuGet Source
run: >
Expand Down
19 changes: 10 additions & 9 deletions src/app/AzureFunc/AzureFunc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<InvariantGlobalization>false</InvariantGlobalization>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.AzureFunc</AssemblyName>
</PropertyGroup>
Expand All @@ -28,23 +29,23 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="GarageGroup.Infra.Azure.DurableTask" Version="0.8.0" />
<PackageReference Include="GarageGroup.Infra.Azure.Endpoint" Version="0.14.0" />
<PackageReference Include="GarageGroup.Infra.Azure.Hosting" Version="0.11.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api" Version="3.17.0" />
<PackageReference Include="GarageGroup.Infra.Azure.DurableTask" Version="0.9.0" />
<PackageReference Include="GarageGroup.Infra.Azure.Endpoint" Version="0.15.0" />
<PackageReference Include="GarageGroup.Infra.Azure.Hosting" Version="0.12.1" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api" Version="3.18.0" />
<PackageReference Include="GarageGroup.Infra.HealthCheck.Handler" Version="0.3.0" />
<PackageReference Include="GarageGroup.Infra.Http.Api" Version="0.2.0" />
<PackageReference Include="GarageGroup.Infra.Http.Api" Version="0.3.0" />
<PackageReference Include="GarageGroup.Infra.Http.Header" Version="0.0.1" />
<PackageReference Include="GarageGroup.Infra.Http.Polly" Version="2.0.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api" Version="2.6.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Provider.Dataverse" Version="0.1.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api" Version="2.7.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Provider.Dataverse" Version="0.2.0" />
<PackageReference Include="GarageGroup.Infra.Telegram.Bot.Api" Version="0.1.0" />
<PackageReference Include="GarageGroup.Infra.Telegram.Bot.Authorization.Api.Dataverse" Version="0.0.2" />
<PackageReference Include="GarageGroup.Infra.Telegram.Bot.Authorization.Azure" Version="0.2.0" />
<PackageReference Include="GarageGroup.Infra.Telegram.Bot.Engine" Version="0.2.0" />
<PackageReference Include="GarageGroup.Infra.Telegram.Bot.Storage.Azure.Blob" Version="0.0.1" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.2" OutputItemType="Analyzer" />
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0-preview2" OutputItemType="Analyzer" />
<PackageReference Include="PrimeFuncPack.DependencyRegistry" Version="2.1.0" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/endpoint/Contact.Get/Contract/Contract.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<InvariantGlobalization>false</InvariantGlobalization>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Endpoint.Contact.Get.Contract</AssemblyName>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/endpoint/Contact.Get/Flow/Flow.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<InvariantGlobalization>false</InvariantGlobalization>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Endpoint.Contact.Get.Flow</AssemblyName>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/endpoint/Incident.Create/Contract/Contract.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<InvariantGlobalization>false</InvariantGlobalization>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Endpoint.Incident.Create.Contract</AssemblyName>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/endpoint/Incident.Create/Flow/Flow.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<InvariantGlobalization>false</InvariantGlobalization>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Endpoint.Incident.Create.Flow</AssemblyName>
</PropertyGroup>
Expand Down
11 changes: 6 additions & 5 deletions src/service/CrmContact/Api/Api.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Service.CrmContact.Api</AssemblyName>
</PropertyGroup>
Expand All @@ -16,11 +17,11 @@

<ItemGroup>
<PackageReference Include="EarlyFuncPack.Core.AsyncPipeline" Version="0.3.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.Search" Version="3.11.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.Search" Version="3.12.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Filter" Version="0.4.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntity" Version="2.2.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntitySet" Version="2.2.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbRequest" Version="2.4.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntity" Version="2.3.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntitySet" Version="2.3.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbRequest" Version="2.5.0" />
<PackageReference Include="PrimeFuncPack.Core.Optional" Version="2.1.0" />
<PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.1.0" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/service/CrmContact/Api/Api/Api.GetLast.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using GarageGroup.Infra;

namespace GarageGroup.Internal.Support;

Expand All @@ -12,7 +11,7 @@ public ValueTask<Result<LastContactSetGetOut, Failure<ContactSetGetFailureCode>>
=>
AsyncPipeline.Pipe(
input, cancellationToken)
.Pipe<IDbQuery>(
.Pipe(
static @in => DbContact.QueryAll with
{
Top = @in.Top,
Expand Down
5 changes: 3 additions & 2 deletions src/service/CrmContact/Contract/Contract.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Service.CrmContact.Contract</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="PrimeFuncPack.Core.Failure" Version="2.2.0" />
<PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.4.0" />
<PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.5.0" />
<PackageReference Include="PrimeFuncPack.Core.Result" Version="2.0.2" />
<PackageReference Include="PrimeFuncPack.Primitives.Strings" Version="2.0.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
namespace GarageGroup.Internal.Support.Service.CrmContact.Test;

internal static partial class CrmContactApiTestSource
{
}
internal static partial class CrmContactApiTestSource;
11 changes: 6 additions & 5 deletions src/service/CrmContact/Test/Test.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support.Service.CrmContact.Test</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Service.CrmContact.Test</AssemblyName>
</PropertyGroup>
Expand All @@ -16,10 +17,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
9 changes: 5 additions & 4 deletions src/service/CrmCustomer/Api/Api.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Service.CrmCustomer.Api</AssemblyName>
</PropertyGroup>
Expand All @@ -16,9 +17,9 @@

<ItemGroup>
<PackageReference Include="EarlyFuncPack.Core.AsyncPipeline" Version="0.3.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.Search" Version="3.11.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntitySet" Version="2.2.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbRequest" Version="2.4.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.Search" Version="3.12.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Abstractions.QueryEntitySet" Version="2.3.0" />
<PackageReference Include="GarageGroup.Infra.Sql.Api.Core.DbRequest" Version="2.5.0" />
<PackageReference Include="PrimeFuncPack.Core.Optional" Version="2.1.0" />
<PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.1.0" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/service/CrmCustomer/Api/Api/Api.GetLast.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using GarageGroup.Infra;

namespace GarageGroup.Internal.Support;

Expand All @@ -12,7 +11,7 @@ public ValueTask<Result<LastCustomerSetGetOut, Failure<CustomerSetGetFailureCode
=>
AsyncPipeline.Pipe(
input, cancellationToken)
.Pipe<IDbQuery>(
.Pipe(
static @in => DbIncidentCustomer.QueryAll with
{
Top = @in.Top,
Expand Down
5 changes: 3 additions & 2 deletions src/service/CrmCustomer/Contract/Contract.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Service.CrmCustomer.Contract</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="PrimeFuncPack.Core.Failure" Version="2.2.0" />
<PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.4.0" />
<PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.5.0" />
<PackageReference Include="PrimeFuncPack.Core.Result" Version="2.0.2" />
<PackageReference Include="PrimeFuncPack.Primitives.Strings" Version="2.0.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
namespace GarageGroup.Internal.Support.Service.CrmCustomer.Test;

internal static partial class CrmCustomerApiTestSource
{
}
internal static partial class CrmCustomerApiTestSource;
11 changes: 6 additions & 5 deletions src/service/CrmCustomer/Test/Test.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<IsPackable>false</IsPackable>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support.Service.CrmCustomer.Test</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Service.CrmCustomer.Test</AssemblyName>
</PropertyGroup>
Expand All @@ -16,10 +17,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
9 changes: 5 additions & 4 deletions src/service/CrmIncident/Api/Api.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Service.CrmIncident.Api</AssemblyName>
</PropertyGroup>
Expand All @@ -16,9 +17,9 @@

<ItemGroup>
<PackageReference Include="GarageGroup.Core.AsyncPipeline.Extensions" Version="0.2.2" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.EntityCreate" Version="3.13.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.Impersonate" Version="2.1.2" />
<PackageReference Include="GarageGroup.Infra.Http.Api.Contract" Version="0.2.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.EntityCreate" Version="3.14.0" />
<PackageReference Include="GarageGroup.Infra.Dataverse.Api.Abstractions.Impersonate" Version="2.1.3" />
<PackageReference Include="GarageGroup.Infra.Http.Api.Contract" Version="0.3.0" />
<PackageReference Include="PrimeFuncPack.Dependency.Core" Version="2.1.0" />
</ItemGroup>

Expand Down
5 changes: 3 additions & 2 deletions src/service/CrmIncident/Contract/Contract.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable>
<InvariantGlobalization>true</InvariantGlobalization>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);IDE0130;CA1859</NoWarn>
<RootNamespace>GarageGroup.Internal.Support</RootNamespace>
<AssemblyName>GarageGroup.Internal.Support.Service.CrmIncident.Contract</AssemblyName>
</PropertyGroup>
Expand All @@ -16,7 +17,7 @@

<ItemGroup>
<PackageReference Include="PrimeFuncPack.Core.Failure" Version="2.2.0" />
<PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.4.0" />
<PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.5.0" />
<PackageReference Include="PrimeFuncPack.Core.Result" Version="2.0.2" />
<PackageReference Include="PrimeFuncPack.Primitives.Strings" Version="2.0.3" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 0d05ef4

Please sign in to comment.