Skip to content

Add .Net 8 target #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 15, 2023
Merged

Add .Net 8 target #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c50cbe1
Add Net8 version
trejjam Nov 15, 2023
49195e8
Add net8 target
trejjam Nov 15, 2023
5791aa7
Update Test.Apple.AppStoreConnect dependency
trejjam Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ jobs:
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
steps:
- name: Setup .Net 7.0.x
- name: Setup .Net
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: |
7.0.x
8.0.x
- uses: actions/checkout@v4
- name: Retore
run: dotnet restore --nologo
Expand All @@ -32,10 +34,10 @@ jobs:
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
steps:
- uses: actions/checkout@v4
- name: Setup .Net 7.0.x
- name: Setup .Net 8.0.x
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
- name: Retore
run: dotnet restore --nologo
- name: .Net Format
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/nightly-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ jobs:
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
steps:
- name: Setup .Net 7.0.x
- name: Setup .Net
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: |
7.0.x
8.0.x
- uses: actions/checkout@v4
- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/pr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ jobs:
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
steps:
- name: Setup .Net 7.0.x
- name: Setup .Net
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: |
7.0.x
8.0.x
- uses: actions/checkout@v4
- name: Retore
run: dotnet restore --nologo
Expand All @@ -32,10 +34,10 @@ jobs:
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
steps:
- uses: actions/checkout@v4
- name: Setup .Net 7.0.x
- name: Setup .Net 8.0.x
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: '8.0.x'
- name: Retore
run: dotnet restore --nologo
- name: .Net Format
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ jobs:
env:
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
steps:
- name: Setup .Net 7.0.x
- name: Setup .Net
uses: actions/setup-dotnet@v3
with:
dotnet-version: '7.0.x'
dotnet-version: |
7.0.x
8.0.x
- uses: actions/checkout@v4
- name: Fetch all history for all tags and branches
run: git fetch --prune --unshallow
Expand Down
2 changes: 1 addition & 1 deletion ....DependencyInjection.Generator/Apple.AppStoreConnect.DependencyInjection.Generator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<PackageLicense>MIT</PackageLicense>
<ProjectName>AppStoreConnect.DependencyInjection.Generator</ProjectName>
Expand Down
8 changes: 6 additions & 2 deletions ...pple.AppStoreConnect.DependencyInjection/Apple.AppStoreConnect.DependencyInjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<PackageLicense>MIT</PackageLicense>
<RepositoryUrl>https://github.com/aviationexam/apple-app-store-connect-api</RepositoryUrl>
Expand All @@ -21,6 +21,10 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Apple.AppStoreConnect\Apple.AppStoreConnect.csproj" />
<ProjectReference Include="..\Apple.AppStoreConnect.DependencyInjection.Generator\Apple.AppStoreConnect.DependencyInjection.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion src/Apple.AppStoreConnect.Generator/Apple.AppStoreConnect.Generator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<PackageLicense>MIT</PackageLicense>
<ProjectName>AppStoreConnect.Generator</ProjectName>
Expand Down
2 changes: 1 addition & 1 deletion src/Apple.AppStoreConnect.GeneratorCommon/Apple.AppStoreConnect.GeneratorCommon.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<PackageLicense>MIT</PackageLicense>
<ProjectName>AppStoreConnect.GeneratorCommon</ProjectName>
Expand Down
2 changes: 1 addition & 1 deletion ...eConnect.OpenApiDocument.Generator/Apple.AppStoreConnect.OpenApiDocument.Generator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<PackageLicense>MIT</PackageLicense>
<ProjectName>AppStoreConnect.OpenApiDocument.Generator</ProjectName>
Expand Down
4 changes: 2 additions & 2 deletions src/Apple.AppStoreConnect.OpenApiDocument/Apple.AppStoreConnect.OpenApiDocument.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<PackageLicense>MIT</PackageLicense>
<ProjectName>AppStoreConnect.OpenApiDocument</ProjectName>
Expand Down
17 changes: 13 additions & 4 deletions src/Apple.AppStoreConnect/Apple.AppStoreConnect.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<PackageLicense>MIT</PackageLicense>
<RepositoryUrl>https://github.com/aviationexam/apple-app-store-connect-api</RepositoryUrl>
Expand All @@ -20,9 +20,9 @@
</PropertyGroup>

<PropertyGroup>
<HttpClientNext_Namespace>Apple.AppStoreConnect</HttpClientNext_Namespace>
<HttpClientNext_Namespace>Apple.AppStoreConnect</HttpClientNext_Namespace>
</PropertyGroup>

<ItemGroup>
<AdditionalFiles Include="app-store-connect-openapi-specification/openapi.json" HttpClientNext_OpenApi="Apple.AppStoreConnect" />
</ItemGroup>
Expand All @@ -39,6 +39,15 @@
<PackageReference Include="System.Text.Json" Version="7.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="H.NSwag.Generator" Version="13.19.0.74" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="7.0.3" />
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Apple.AppStoreConnect.Generator\Apple.AppStoreConnect.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="all" />
<ProjectReference Include="..\Apple.AppStoreConnect.OpenApiDocument\Apple.AppStoreConnect.OpenApiDocument.csproj" PrivateAssets="All" />
Expand Down
23 changes: 17 additions & 6 deletions src/Test.Apple.AppStoreConnect/Test.Apple.AppStoreConnect.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
<LangVersion>12.0</LangVersion>
<Nullable>enable</Nullable>
<PackageLicense>MIT</PackageLicense>
</PropertyGroup>
Expand All @@ -16,10 +16,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.13" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />

<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Moq" Version="4.20.69" />
Expand All @@ -30,6 +27,20 @@
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.14" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="AuthKey_TestKeyId.p8" />
</ItemGroup>
Expand Down