From f087c3fa268eb5c3224cd0a98cfad2d2a70d1e1e Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Sat, 26 Aug 2023 09:50:24 +0200 Subject: [PATCH 1/8] don't refererence System.Memory and System.ObjectModel in Target Frameworks that don't need them --- Source/Svg.csproj | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Svg.csproj b/Source/Svg.csproj index e571f3b03..76ca42d9f 100644 --- a/Source/Svg.csproj +++ b/Source/Svg.csproj @@ -68,16 +68,18 @@ - + - - - + + + + + @@ -89,7 +91,6 @@ - From 0c14047a857f33cd3161bfe1655e7dd903db63ad Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Sat, 26 Aug 2023 09:55:28 +0200 Subject: [PATCH 2/8] remove system.objectmodel (is already in .netstandard 2.0) --- Source/Svg.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Svg.csproj b/Source/Svg.csproj index 76ca42d9f..d02ba965d 100644 --- a/Source/Svg.csproj +++ b/Source/Svg.csproj @@ -72,10 +72,6 @@ - - - - From bdcedf5f887630e5b784ebc9bc1b60008210fb65 Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Sat, 26 Aug 2023 10:03:17 +0200 Subject: [PATCH 3/8] trying to fix build --- Source/Svg.sln | 5 +++-- global.json | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 global.json diff --git a/Source/Svg.sln b/Source/Svg.sln index ecb1a74e8..f61134f50 100644 --- a/Source/Svg.sln +++ b/Source/Svg.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34004.107 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg", "Svg.csproj", "{886A98C5-37C0-4E8B-885E-30C1D2F98B47}" EndProject @@ -10,6 +10,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A417AF1E-BEDB-4715-B4FD-D795579217F9}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig + ..\global.json = ..\global.json Local.testsettings = Local.testsettings Svg.vsmdi = Svg.vsmdi TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings diff --git a/global.json b/global.json new file mode 100644 index 000000000..a083ec750 --- /dev/null +++ b/global.json @@ -0,0 +1,12 @@ +{ + "sdk": { + "allowPrerelease": false, + "version": "3.1.0", + "rollForward": "latestMajor" + }, + "tools": { + "allowPrerelease": false, + "dotnet": "3.1.0", + "rollForward": "latestMajor" + } +} From 39a4704ea198df792bb0f877dc1c81cf717c850b Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Sat, 26 Aug 2023 10:06:56 +0200 Subject: [PATCH 4/8] Revert "trying to fix build" This reverts commit bdcedf5f887630e5b784ebc9bc1b60008210fb65. --- Source/Svg.sln | 5 ++--- global.json | 12 ------------ 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 global.json diff --git a/Source/Svg.sln b/Source/Svg.sln index f61134f50..ecb1a74e8 100644 --- a/Source/Svg.sln +++ b/Source/Svg.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34004.107 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29215.179 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg", "Svg.csproj", "{886A98C5-37C0-4E8B-885E-30C1D2F98B47}" EndProject @@ -10,7 +10,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A417AF1E-BEDB-4715-B4FD-D795579217F9}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - ..\global.json = ..\global.json Local.testsettings = Local.testsettings Svg.vsmdi = Svg.vsmdi TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings diff --git a/global.json b/global.json deleted file mode 100644 index a083ec750..000000000 --- a/global.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "sdk": { - "allowPrerelease": false, - "version": "3.1.0", - "rollForward": "latestMajor" - }, - "tools": { - "allowPrerelease": false, - "dotnet": "3.1.0", - "rollForward": "latestMajor" - } -} From db413c6bde44205817b49af7cd51c6fd46556c8b Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Sat, 26 Aug 2023 10:11:28 +0200 Subject: [PATCH 5/8] install .net 3.1 sdk --- .github/workflows/runtests.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml index 9e94fe6cb..4a4c54aa4 100644 --- a/.github/workflows/runtests.yml +++ b/.github/workflows/runtests.yml @@ -25,6 +25,13 @@ jobs: with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget }} + # .Net 3.1 update + - name: Setup .NET 7 SDK + uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 3.1.x + include-prerelease: false - name: Restore NuGet Packages if: steps.cache.outputs.cache-hit != 'true' run: | @@ -58,6 +65,13 @@ jobs: with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-bench }} + # .Net 3.1 update + - name: Setup .NET 7 SDK + uses: actions/setup-dotnet@v3 + with: + dotnet-version: | + 3.1.x + include-prerelease: false - name: Restore NuGet Packages if: steps.cache.outputs.cache-hit != 'true' run: | From cdbb6a02b1d9380e217edf5088360e9e423e6b80 Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Sat, 26 Aug 2023 10:12:56 +0200 Subject: [PATCH 6/8] fixing caption --- .github/workflows/runtests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml index 4a4c54aa4..2a53f8c97 100644 --- a/.github/workflows/runtests.yml +++ b/.github/workflows/runtests.yml @@ -26,7 +26,7 @@ jobs: path: ~/.nuget/packages key: ${{ runner.os }}-nuget }} # .Net 3.1 update - - name: Setup .NET 7 SDK + - name: Setup .NET 3.1 SDK uses: actions/setup-dotnet@v3 with: dotnet-version: | @@ -66,7 +66,7 @@ jobs: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-bench }} # .Net 3.1 update - - name: Setup .NET 7 SDK + - name: Setup .NET 3.1 SDK uses: actions/setup-dotnet@v3 with: dotnet-version: | From d0ea08fbd50a855cf2f76f87b84d9a2fb5e50856 Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Sat, 26 Aug 2023 10:51:13 +0200 Subject: [PATCH 7/8] Revert "fixing caption" This reverts commit cdbb6a02b1d9380e217edf5088360e9e423e6b80. --- .github/workflows/runtests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml index 2a53f8c97..4a4c54aa4 100644 --- a/.github/workflows/runtests.yml +++ b/.github/workflows/runtests.yml @@ -26,7 +26,7 @@ jobs: path: ~/.nuget/packages key: ${{ runner.os }}-nuget }} # .Net 3.1 update - - name: Setup .NET 3.1 SDK + - name: Setup .NET 7 SDK uses: actions/setup-dotnet@v3 with: dotnet-version: | @@ -66,7 +66,7 @@ jobs: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-bench }} # .Net 3.1 update - - name: Setup .NET 3.1 SDK + - name: Setup .NET 7 SDK uses: actions/setup-dotnet@v3 with: dotnet-version: | From 90bcc89e56f481005b8e2bf90a794c76c090069a Mon Sep 17 00:00:00 2001 From: Inforithmics Date: Sat, 26 Aug 2023 10:51:17 +0200 Subject: [PATCH 8/8] Revert "install .net 3.1 sdk" This reverts commit db413c6bde44205817b49af7cd51c6fd46556c8b. --- .github/workflows/runtests.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml index 4a4c54aa4..9e94fe6cb 100644 --- a/.github/workflows/runtests.yml +++ b/.github/workflows/runtests.yml @@ -25,13 +25,6 @@ jobs: with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget }} - # .Net 3.1 update - - name: Setup .NET 7 SDK - uses: actions/setup-dotnet@v3 - with: - dotnet-version: | - 3.1.x - include-prerelease: false - name: Restore NuGet Packages if: steps.cache.outputs.cache-hit != 'true' run: | @@ -65,13 +58,6 @@ jobs: with: path: ~/.nuget/packages key: ${{ runner.os }}-nuget-bench }} - # .Net 3.1 update - - name: Setup .NET 7 SDK - uses: actions/setup-dotnet@v3 - with: - dotnet-version: | - 3.1.x - include-prerelease: false - name: Restore NuGet Packages if: steps.cache.outputs.cache-hit != 'true' run: |