Skip to content

Commit

Permalink
Merge pull request #70 from amiuhle/net8.0
Browse files Browse the repository at this point in the history
Target .NET 8.0
  • Loading branch information
HeDo88TH authored Nov 3, 2024
2 parents e1a532a + a64b3a0 commit 257b204
Show file tree
Hide file tree
Showing 15 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v2
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Build
run: echo ${{ github.sha }} > Release.txt
Expand All @@ -34,17 +34,17 @@ jobs:
run: dotnet publish -p:PublishProfile=osx-x64.pubxml Obj2Tiles

- name: Zip win-x64
run: cd Obj2Tiles/bin/Release/net7.0/publish/win-x64/ && zip -r ../../../../../../Obj2Tiles-Win64.zip *
run: cd Obj2Tiles/bin/Release/net8.0/publish/win-x64/ && zip -r ../../../../../../Obj2Tiles-Win64.zip *
- name: Zip win-arm
run: cd Obj2Tiles/bin/Release/net7.0/publish/win-arm/ && zip -r ../../../../../../Obj2Tiles-WinArm.zip *
run: cd Obj2Tiles/bin/Release/net8.0/publish/win-arm/ && zip -r ../../../../../../Obj2Tiles-WinArm.zip *
- name: Zip win-arm64
run: cd Obj2Tiles/bin/Release/net7.0/publish/win-arm64/ && zip -r ../../../../../../Obj2Tiles-WinArm64.zip *
run: cd Obj2Tiles/bin/Release/net8.0/publish/win-arm64/ && zip -r ../../../../../../Obj2Tiles-WinArm64.zip *
- name: Zip linux-x64
run: cd Obj2Tiles/bin/Release/net7.0/publish/linux-x64/ && zip -r ../../../../../../Obj2Tiles-Linux64.zip *
run: cd Obj2Tiles/bin/Release/net8.0/publish/linux-x64/ && zip -r ../../../../../../Obj2Tiles-Linux64.zip *
- name: Zip linux-arm
run: cd Obj2Tiles/bin/Release/net7.0/publish/linux-arm/ && zip -r ../../../../../../Obj2Tiles-LinuxArm.zip *
run: cd Obj2Tiles/bin/Release/net8.0/publish/linux-arm/ && zip -r ../../../../../../Obj2Tiles-LinuxArm.zip *
- name: Zip osx-x64
run: cd Obj2Tiles/bin/Release/net7.0/publish/osx-x64/ && zip -r ../../../../../../Obj2Tiles-Osx64.zip *
run: cd Obj2Tiles/bin/Release/net8.0/publish/osx-x64/ && zip -r ../../../../../../Obj2Tiles-Osx64.zip *

- name: Release
uses: softprops/action-gh-release@v1
Expand Down
2 changes: 1 addition & 1 deletion MeshDecimatorCore/MeshDecimatorCore.csproj
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 Obj2Gltf/Obj2Gltf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Configurations>Source;Debug;Release</Configurations>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<IsPackable>true</IsPackable>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>10</LangVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion Obj2Tiles.Common/Obj2Tiles.Common.csproj
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 Obj2Tiles.Library.Test/Obj2Tiles.Library.Test.csproj
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>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion Obj2Tiles.Library/Obj2Tiles.Library.csproj
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 Obj2Tiles.Test/Obj2Tiles.Test.csproj
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>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion Obj2Tiles/Obj2Tiles.csproj
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>
<IsPackable>false</IsPackable>
Expand Down
6 changes: 3 additions & 3 deletions Obj2Tiles/Properties/PublishProfiles/linux-arm.pubxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net7.0\publish\linux-arm\</PublishDir>
<PublishDir>bin\Release\net8.0\publish\linux-arm\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>linux-arm</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
Expand All @@ -17,4 +17,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
<DebuggerSupport>false</DebuggerSupport>
</PropertyGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions Obj2Tiles/Properties/PublishProfiles/linux-x64.pubxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net7.0\publish\linux-x64\</PublishDir>
<PublishDir>bin\Release\net8.0\publish\linux-x64\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
Expand All @@ -17,4 +17,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
<DebuggerSupport>false</DebuggerSupport>
</PropertyGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions Obj2Tiles/Properties/PublishProfiles/osx-x64.pubxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net7.0\publish\osx-x64\</PublishDir>
<PublishDir>bin\Release\net8.0\publish\osx-x64\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
Expand All @@ -17,4 +17,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
<DebuggerSupport>false</DebuggerSupport>
</PropertyGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions Obj2Tiles/Properties/PublishProfiles/win-arm.pubxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net7.0\publish\win-arm\</PublishDir>
<PublishDir>bin\Release\net8.0\publish\win-arm\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-arm</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
Expand All @@ -18,4 +18,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
<DebuggerSupport>false</DebuggerSupport>
</PropertyGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions Obj2Tiles/Properties/PublishProfiles/win-arm64.pubxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net7.0\publish\win-arm64\</PublishDir>
<PublishDir>bin\Release\net8.0\publish\win-arm64\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
Expand All @@ -18,4 +18,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
<DebuggerSupport>false</DebuggerSupport>
</PropertyGroup>
</Project>
</Project>
6 changes: 3 additions & 3 deletions Obj2Tiles/Properties/PublishProfiles/win-x64.pubxml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net7.0\publish\win-x64\</PublishDir>
<PublishDir>bin\Release\net8.0\publish\win-x64\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>True</PublishSingleFile>
Expand All @@ -18,4 +18,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
<DebuggerSupport>false</DebuggerSupport>
</PropertyGroup>
</Project>
</Project>

0 comments on commit 257b204

Please sign in to comment.