Skip to content

Commit

Permalink
.NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
damianh committed Nov 18, 2023
1 parent 51a6049 commit 46820e7
Show file tree
Hide file tree
Showing 68 changed files with 177 additions and 241 deletions.
3 changes: 1 addition & 2 deletions .github/WorkflowGen/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,13 @@ void GenerateWorkflowsForLibs()
EnvSecret("GITHUB_TOKEN"),
EnvSecret("LOGICALITY_NUGET_ORG"),
EnvSecret("WEBHOOKRELAYTOKENKEY"),
EnvSecret("WEBHOOKRELAYTOKENKEY"),
EnvSecret("WEBHOOKURL"));

buildJob.Step().ActionsCheckout();

buildJob.Step().LogIntoGitHubContainerRegistry();

buildJob.Step().ActionsSetupDotNet("6.0.x", "7.0.x");
buildJob.Step().ActionsSetupDotNet("8.0.x");

buildJob.Step().PrintEnvironment();

Expand Down
2 changes: 1 addition & 1 deletion .github/WorkflowGen/WorkflowGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/aspnet-core-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/bullseye-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/configuration-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/github-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/hosting-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/lambda-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/little-forker-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/pulumi-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/system-extensions-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/webhook-relay-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ jobs:
build:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
LOGICALITY_NUGET_ORG: ${{secrets.LOGICALITY_NUGET_ORG}}
WEBHOOKRELAYTOKENKEY: ${{secrets.WEBHOOKRELAYTOKENKEY}}
WEBHOOKRELAYTOKENSECRET: ${{secrets.WEBHOOKRELAYTOKENSECRET}}
WEBHOOKURL: ${{secrets.WEBHOOKURL}}
GITHUB_TOKEN: ${secrets.GITHUB_TOKEN}
LOGICALITY_NUGET_ORG: ${secrets.LOGICALITY_NUGET_ORG}
WEBHOOKRELAYTOKENKEY: ${secrets.WEBHOOKRELAYTOKENKEY}
WEBHOOKURL: ${secrets.WEBHOOKURL}
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -35,7 +34,7 @@ jobs:
- name: Setup Dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x 7.0.x
dotnet-version: 8.0.x
- name: Print Env
run: printenv
shell: bash
Expand Down
6 changes: 6 additions & 0 deletions PlatformLibs.sln
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,14 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eventsourcing-domain", "eventsourcing-domain", "{498AADAB-47D0-42A9-A0CB-FDCB88EA9851}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27A73E33-80F2-454E-ABC5-48152B71AB40}"
ProjectSection(SolutionItems) = preProject
libs\eventsourcing-domain\src\Directory.Build.props = libs\eventsourcing-domain\src\Directory.Build.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{910A4153-8490-4C9A-93C3-33941F3D8F3F}"
ProjectSection(SolutionItems) = preProject
libs\eventsourcing-domain\tests\Directory.Build.props = libs\eventsourcing-domain\tests\Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventSourcing.Domain", "libs\eventsourcing-domain\src\EventSourcing.Domain\EventSourcing.Domain.csproj", "{2F8B7E58-DDBF-4DAB-8A14-22CD5497E7FE}"
EndProject
Expand Down
1 change: 0 additions & 1 deletion libs/aspnet-core/src/AspNetCore/AspNetCore.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<Description>A set of extensions and helpers for ASP.NET Core.</Description>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<AssemblyName>Logicality.AspNetCore.Tests</AssemblyName>
<RootNamespace>Logicality.AspNetCore</RootNamespace>
</PropertyGroup>
Expand Down
4 changes: 1 addition & 3 deletions libs/bullseye/src/Bullseye/Bullseye.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Description>A set of extensions and helpers for bullseye.</Description>
</PropertyGroup>

</Project>
6 changes: 0 additions & 6 deletions libs/bullseye/tests/Bullseye.Tests/Bullseye.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Bullseye\Bullseye.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<Description>Extensions over Microsoft.Extensions.Configuration.</Description>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<AssemblyName>$(Org).Extensions.Configuration.Tests</AssemblyName>
<RootNamespace>$(Org).Extensions.Configuration</RootNamespace>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
Loading

0 comments on commit 46820e7

Please sign in to comment.