From a7e88b6cecbbc3ccf405e948c2334a4490c5c3d7 Mon Sep 17 00:00:00 2001 From: Timo Uhlmann Date: Sun, 3 Nov 2024 01:13:39 +0100 Subject: [PATCH 1/2] net8.0 --- MeshDecimatorCore/MeshDecimatorCore.csproj | 2 +- Obj2Gltf/Obj2Gltf.csproj | 2 +- Obj2Tiles.Common/Obj2Tiles.Common.csproj | 2 +- Obj2Tiles.Library.Test/Obj2Tiles.Library.Test.csproj | 2 +- Obj2Tiles.Library/Obj2Tiles.Library.csproj | 2 +- Obj2Tiles.Test/Obj2Tiles.Test.csproj | 2 +- Obj2Tiles/Obj2Tiles.csproj | 2 +- Obj2Tiles/Properties/PublishProfiles/linux-arm.pubxml | 6 +++--- Obj2Tiles/Properties/PublishProfiles/linux-x64.pubxml | 6 +++--- Obj2Tiles/Properties/PublishProfiles/osx-x64.pubxml | 6 +++--- Obj2Tiles/Properties/PublishProfiles/win-arm.pubxml | 6 +++--- Obj2Tiles/Properties/PublishProfiles/win-arm64.pubxml | 6 +++--- Obj2Tiles/Properties/PublishProfiles/win-x64.pubxml | 6 +++--- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/MeshDecimatorCore/MeshDecimatorCore.csproj b/MeshDecimatorCore/MeshDecimatorCore.csproj index 6836c68..8a91831 100644 --- a/MeshDecimatorCore/MeshDecimatorCore.csproj +++ b/MeshDecimatorCore/MeshDecimatorCore.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/Obj2Gltf/Obj2Gltf.csproj b/Obj2Gltf/Obj2Gltf.csproj index 27f3c76..46796d3 100644 --- a/Obj2Gltf/Obj2Gltf.csproj +++ b/Obj2Gltf/Obj2Gltf.csproj @@ -11,7 +11,7 @@ Source;Debug;Release true true - net7.0 + net8.0 10 diff --git a/Obj2Tiles.Common/Obj2Tiles.Common.csproj b/Obj2Tiles.Common/Obj2Tiles.Common.csproj index 6836c68..8a91831 100644 --- a/Obj2Tiles.Common/Obj2Tiles.Common.csproj +++ b/Obj2Tiles.Common/Obj2Tiles.Common.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/Obj2Tiles.Library.Test/Obj2Tiles.Library.Test.csproj b/Obj2Tiles.Library.Test/Obj2Tiles.Library.Test.csproj index 24179c6..20bc2b6 100644 --- a/Obj2Tiles.Library.Test/Obj2Tiles.Library.Test.csproj +++ b/Obj2Tiles.Library.Test/Obj2Tiles.Library.Test.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable false diff --git a/Obj2Tiles.Library/Obj2Tiles.Library.csproj b/Obj2Tiles.Library/Obj2Tiles.Library.csproj index 9ca818e..816cc2d 100644 --- a/Obj2Tiles.Library/Obj2Tiles.Library.csproj +++ b/Obj2Tiles.Library/Obj2Tiles.Library.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/Obj2Tiles.Test/Obj2Tiles.Test.csproj b/Obj2Tiles.Test/Obj2Tiles.Test.csproj index 4c9775a..95e6779 100644 --- a/Obj2Tiles.Test/Obj2Tiles.Test.csproj +++ b/Obj2Tiles.Test/Obj2Tiles.Test.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable false diff --git a/Obj2Tiles/Obj2Tiles.csproj b/Obj2Tiles/Obj2Tiles.csproj index b122bb4..999b843 100644 --- a/Obj2Tiles/Obj2Tiles.csproj +++ b/Obj2Tiles/Obj2Tiles.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 enable enable false diff --git a/Obj2Tiles/Properties/PublishProfiles/linux-arm.pubxml b/Obj2Tiles/Properties/PublishProfiles/linux-arm.pubxml index 104cc54..1672ccd 100644 --- a/Obj2Tiles/Properties/PublishProfiles/linux-arm.pubxml +++ b/Obj2Tiles/Properties/PublishProfiles/linux-arm.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net7.0\publish\linux-arm\ + bin\Release\net8.0\publish\linux-arm\ FileSystem - net7.0 + net8.0 linux-arm true True @@ -17,4 +17,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true false - \ No newline at end of file + diff --git a/Obj2Tiles/Properties/PublishProfiles/linux-x64.pubxml b/Obj2Tiles/Properties/PublishProfiles/linux-x64.pubxml index c7355f3..edade88 100644 --- a/Obj2Tiles/Properties/PublishProfiles/linux-x64.pubxml +++ b/Obj2Tiles/Properties/PublishProfiles/linux-x64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net7.0\publish\linux-x64\ + bin\Release\net8.0\publish\linux-x64\ FileSystem - net7.0 + net8.0 linux-x64 true True @@ -17,4 +17,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true false - \ No newline at end of file + diff --git a/Obj2Tiles/Properties/PublishProfiles/osx-x64.pubxml b/Obj2Tiles/Properties/PublishProfiles/osx-x64.pubxml index 3d08546..f9da46f 100644 --- a/Obj2Tiles/Properties/PublishProfiles/osx-x64.pubxml +++ b/Obj2Tiles/Properties/PublishProfiles/osx-x64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net7.0\publish\osx-x64\ + bin\Release\net8.0\publish\osx-x64\ FileSystem - net7.0 + net8.0 osx-x64 true True @@ -17,4 +17,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true false - \ No newline at end of file + diff --git a/Obj2Tiles/Properties/PublishProfiles/win-arm.pubxml b/Obj2Tiles/Properties/PublishProfiles/win-arm.pubxml index 858c980..0a53430 100644 --- a/Obj2Tiles/Properties/PublishProfiles/win-arm.pubxml +++ b/Obj2Tiles/Properties/PublishProfiles/win-arm.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net7.0\publish\win-arm\ + bin\Release\net8.0\publish\win-arm\ FileSystem - net7.0 + net8.0 win-arm true True @@ -18,4 +18,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true false - \ No newline at end of file + diff --git a/Obj2Tiles/Properties/PublishProfiles/win-arm64.pubxml b/Obj2Tiles/Properties/PublishProfiles/win-arm64.pubxml index 90e5b70..2a83f90 100644 --- a/Obj2Tiles/Properties/PublishProfiles/win-arm64.pubxml +++ b/Obj2Tiles/Properties/PublishProfiles/win-arm64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net7.0\publish\win-arm64\ + bin\Release\net8.0\publish\win-arm64\ FileSystem - net7.0 + net8.0 win-arm64 true True @@ -18,4 +18,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true false - \ No newline at end of file + diff --git a/Obj2Tiles/Properties/PublishProfiles/win-x64.pubxml b/Obj2Tiles/Properties/PublishProfiles/win-x64.pubxml index 6697f7f..c57f837 100644 --- a/Obj2Tiles/Properties/PublishProfiles/win-x64.pubxml +++ b/Obj2Tiles/Properties/PublishProfiles/win-x64.pubxml @@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - bin\Release\net7.0\publish\win-x64\ + bin\Release\net8.0\publish\win-x64\ FileSystem - net7.0 + net8.0 win-x64 true True @@ -18,4 +18,4 @@ https://go.microsoft.com/fwlink/?LinkID=208121. true false - \ No newline at end of file + From a64b3a0101c6993108b486573d1d67a71e09f5a6 Mon Sep 17 00:00:00 2001 From: Luca Di Leo Date: Sun, 3 Nov 2024 14:38:02 +0100 Subject: [PATCH 2/2] Workflows upgraded to net8 --- .github/workflows/build-test.yml | 2 +- .github/workflows/publish.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index db97db6..530794c 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9305ca0..144fa4f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 @@ -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