Skip to content
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

Bump all templates and build system to use net8.0 #201

Merged
merged 4 commits into from
Jan 12, 2024
Merged

Bump all templates and build system to use net8.0 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddc996c
Bump all templates and build system to use net8.0
Arkatufus Jan 12, 2024
4d6f797
Merge branch 'dev' into Bump-templates-to-net8.0
Arkatufus Jan 12, 2024
81f11d2
Bump Petabridge.Cmd to 1.4.0
Arkatufus Jan 12, 2024
32a966c
Fix MS.NET.Build.Containers
Arkatufus Jan 12, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/pr_validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
8.0.x
global-json-file: "./global.json"
- name: "dotnet pack"
run: dotnet pack -c Release
Expand All @@ -46,7 +46,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
8.0.x
global-json-file: "./global.json"
- name: "dotnet build"
run: dotnet build -c Release
Expand All @@ -71,7 +71,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.0.x
8.0.x
global-json-file: "./global.json"
- name: "dotnet docker"
run: dotnet publish --os linux --arch x64 -c Release -p:PublishProfile=DefaultContainer
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "7.0.100"
"version": "8.0.101"
}
}
2 changes: 1 addition & 1 deletion src/AkkaConsoleTemplate/.github/workflows/pr_validation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/[email protected]
with:
dotnet-version: |
7.0.x
8.0.x
global-json-file: "./global.json"

- name: "dotnet build"
Expand Down
2 changes: 1 addition & 1 deletion src/AkkaConsoleTemplate/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
</PropertyGroup>

<PropertyGroup Label="Dependencies">
<PbmVersion>1.3.0</PbmVersion>
<PbmVersion>1.4.0</PbmVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/AkkaConsoleTemplate/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "7.0.100"
"version": "8.0.101"
}
}
2 changes: 1 addition & 1 deletion src/AkkaConsoleTemplate/src/AkkaConsoleTemplate.App/AkkaConsoleTemplate.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/AkkaStreamsTemplate/.github/workflows/pr_validation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/[email protected]
with:
dotnet-version: |
7.0.x
8.0.x
global-json-file: "./global.json"

- name: "dotnet build"
Expand Down
2 changes: 1 addition & 1 deletion src/AkkaStreamsTemplate/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
</PropertyGroup>

<PropertyGroup Label="Dependencies">
<PbmVersion>1.3.0</PbmVersion>
<PbmVersion>1.4.0</PbmVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/AkkaStreamsTemplate/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "7.0.100"
"version": "8.0.101"
}
}
2 changes: 1 addition & 1 deletion src/AkkaStreamsTemplate/src/AkkaStreamsTemplate.App/AkkaStreamsTemplate.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/WebApiTemplate/.github/workflows/pr_validation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: actions/[email protected]
with:
dotnet-version: |
7.0.x
8.0.x
global-json-file: "./global.json"

- name: "dotnet build"
Expand All @@ -55,7 +55,7 @@ jobs:
uses: actions/[email protected]
with:
dotnet-version: |
7.0.x
8.0.x
global-json-file: "./global.json"

- name: "dotnet docker"
Expand Down
2 changes: 1 addition & 1 deletion src/WebApiTemplate/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
</PropertyGroup>

<PropertyGroup Label="Dependencies">
<PbmVersion>1.3.3</PbmVersion>
<PbmVersion>1.4.0</PbmVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/WebApiTemplate/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<!-- ASP.NET Core Package Versions -->
<ItemGroup>
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="7.0.15" />
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/WebApiTemplate/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestMinor",
"version": "7.0.100"
"version": "8.0.101"
}
}
5 changes: 2 additions & 3 deletions src/WebApiTemplate/src/WebApiTemplate.App/WebApiTemplate.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<ContainerImageName>webpapitemplate-app</ContainerImageName>
<ContainerRepository>webpapitemplate-app</ContainerRepository>
<ContainerImageTags>$(VersionPrefix);latest</ContainerImageTags>
</PropertyGroup>

Expand All @@ -24,7 +24,6 @@
<PackageReference Include="Akka.Management" />
<PackageReference Include="Akka.Persistence.Azure.Hosting" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" />
<PackageReference Include="Microsoft.NET.Build.Containers" />
<PackageReference Include="Petabridge.Cmd.Cluster" />
<PackageReference Include="Petabridge.Cmd.Cluster.Sharding" />
<PackageReference Include="Petabridge.Cmd.Remote" />
Expand Down
2 changes: 1 addition & 1 deletion src/WebApiTemplate/src/WebApiTemplate.Domain/WebApiTemplate.Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/WebApiTemplate/tests/WebApiTemplate.App.Tests/WebApiTemplate.App.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
Loading