From 3eb302ac54c1f92466a6acb240387cb3c9c6edb0 Mon Sep 17 00:00:00 2001 From: Jason Thompson Date: Thu, 9 Sep 2021 18:59:58 -0500 Subject: [PATCH 1/7] Migrated .Net Framework projects to .NET, retargeted projects for netstandard2.1 and/or net6.0 where appropriate, upgraded language level to latest for use with .NET 6 --- .../Facepunch.Steamworks.TestWin32.csproj | 131 ++------------- ...ch.Steamworks.TestWin32.csproj.DotSettings | 2 + .../Facepunch.Steamworks.TestWin32.csproj.old | 156 ++++++++++++++++++ .../Facepunch.Steamworks.TestWin64.csproj | 132 ++------------- ...ch.Steamworks.TestWin64.csproj.DotSettings | 2 + .../Facepunch.Steamworks.TestWin64.csproj.old | 156 ++++++++++++++++++ .../Facepunch.Steamworks.Posix.csproj | 4 +- ...epunch.Steamworks.Posix.csproj.DotSettings | 2 + .../Facepunch.Steamworks.Win32.csproj | 7 +- ...epunch.Steamworks.Win32.csproj.DotSettings | 2 + .../Facepunch.Steamworks.Win64.csproj | 7 +- ...epunch.Steamworks.Win64.csproj.DotSettings | 2 + Generator/App.config | 6 - Generator/Generator.csproj | 87 +--------- Generator/Generator.csproj.DotSettings | 2 + Generator/Generator.csproj.old | 86 ++++++++++ 16 files changed, 455 insertions(+), 329 deletions(-) create mode 100644 Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.DotSettings create mode 100644 Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.old create mode 100644 Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.DotSettings create mode 100644 Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.old create mode 100644 Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj.DotSettings create mode 100644 Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj.DotSettings create mode 100644 Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj.DotSettings delete mode 100644 Generator/App.config create mode 100644 Generator/Generator.csproj.DotSettings create mode 100644 Generator/Generator.csproj.old diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj index 278596f..b5d97a7 100644 --- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj +++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj @@ -1,156 +1,55 @@ - - - - - Debug - AnyCPU - {3F6183AD-D966-44F2-A6EB-42E61E591B49} - Library - Properties - Facepunch.Steamworks.TestWin32 - Facepunch.Steamworks.TestWin32 - v4.6 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - + - true - full - false - bin\Debug\ TRACE;DEBUG;TEST_WIN32 - prompt - 4 x86 true - pdbonly - true - bin\Release\ TRACE;TEST_WIN32 - prompt - 4 x64 true - true bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt MinimumRecommendedRules.ruleset true bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt MinimumRecommendedRules.ruleset true - true bin\x86\Debug\ - DEBUG;TRACE - full x64 - prompt MinimumRecommendedRules.ruleset true bin\x86\Release\ - TRACE - true - pdbonly x64 - prompt MinimumRecommendedRules.ruleset true + + net6.0 + false + - - ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - ..\packages\Newtonsoft.Json.9.0.2-beta1\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2d6247f6-8ab2-405f-a00e-3a364b808a55} - Facepunch.Steamworks.Win32 - + Always - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.DotSettings b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.DotSettings new file mode 100644 index 0000000..195c460 --- /dev/null +++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.DotSettings @@ -0,0 +1,2 @@ + + Latest \ No newline at end of file diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.old b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.old new file mode 100644 index 0000000..7968e36 --- /dev/null +++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.old @@ -0,0 +1,156 @@ + + + + + Debug + AnyCPU + {3F6183AD-D966-44F2-A6EB-42E61E591B49} + Library + Properties + Facepunch.Steamworks.TestWin32 + Facepunch.Steamworks.TestWin32 + v4.6 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + + true + full + false + bin\Debug\ + TRACE;DEBUG;TEST_WIN32 + prompt + 4 + x86 + true + + + pdbonly + true + bin\Release\ + TRACE;TEST_WIN32 + prompt + 4 + x64 + true + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + + ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + ..\packages\Newtonsoft.Json.9.0.2-beta1\lib\net45\Newtonsoft.Json.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2d6247f6-8ab2-405f-a00e-3a364b808a55} + Facepunch.Steamworks.Win32 + + + + + Always + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + \ No newline at end of file diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj index c4353e2..2a18571 100644 --- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj +++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj @@ -1,156 +1,54 @@ - - - - - Debug - AnyCPU - {165081E3-BD96-404B-B83E-A635F1AF7CDE} - Library - Properties - Facepunch.Steamworks.TestWin64 - Facepunch.Steamworks.TestWin64 - v4.6 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - + - true - full - false - bin\Debug\ TRACE;DEBUG;TEST_WIN64 - prompt - 4 x64 true - pdbonly - true - bin\Release\ - TRACE - prompt - 4 x64 true - true bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt MinimumRecommendedRules.ruleset true bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt MinimumRecommendedRules.ruleset true - true bin\x86\Debug\ - DEBUG;TRACE - full x64 - prompt MinimumRecommendedRules.ruleset true bin\x86\Release\ - TRACE - true - pdbonly x64 - prompt MinimumRecommendedRules.ruleset true + + net6.0 + false + - - ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - ..\packages\Newtonsoft.Json.9.0.2-beta1\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8c73da93-73ad-4445-9a2c-15d4a44337d3} - Facepunch.Steamworks.Win64 - + Always - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.DotSettings b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.DotSettings new file mode 100644 index 0000000..195c460 --- /dev/null +++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.DotSettings @@ -0,0 +1,2 @@ + + Latest \ No newline at end of file diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.old b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.old new file mode 100644 index 0000000..76e0bb3 --- /dev/null +++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.old @@ -0,0 +1,156 @@ + + + + + Debug + AnyCPU + {165081E3-BD96-404B-B83E-A635F1AF7CDE} + Library + Properties + Facepunch.Steamworks.TestWin64 + Facepunch.Steamworks.TestWin64 + v4.6 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + + true + full + false + bin\Debug\ + TRACE;DEBUG;TEST_WIN64 + prompt + 4 + x64 + true + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + x64 + true + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + + ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + + + ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + + + ..\packages\Newtonsoft.Json.9.0.2-beta1\lib\net45\Newtonsoft.Json.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {8c73da93-73ad-4445-9a2c-15d4a44337d3} + Facepunch.Steamworks.Win64 + + + + + Always + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + \ No newline at end of file diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj index 0a0e3c5..525e62d 100644 --- a/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj +++ b/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj @@ -3,9 +3,9 @@ Facepunch.Steamworks.Posix $(DefineConstants);PLATFORM_POSIX - netstandard2.0;net46 + netstandard2.1;net6.0 true - 7.1 + 10 true false Steamworks diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj.DotSettings b/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj.DotSettings new file mode 100644 index 0000000..195c460 --- /dev/null +++ b/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj.DotSettings @@ -0,0 +1,2 @@ + + Latest \ No newline at end of file diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj index 9304d2d..e51bb00 100644 --- a/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj +++ b/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj @@ -3,9 +3,8 @@ Facepunch.Steamworks.Win32 $(DefineConstants);PLATFORM_WIN32;PLATFORM_WIN - netstandard2.0;net46 - true - 7.1 + netstandard2.1;net6.0 + true true true Steamworks @@ -19,7 +18,7 @@ https://github.com/Facepunch/Facepunch.Steamworks Facepunch.Steamworks.jpg facepunch;steam;unity;steamworks;valve - latest + 10 MIT https://github.com/Facepunch/Facepunch.Steamworks.git git diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj.DotSettings b/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj.DotSettings new file mode 100644 index 0000000..195c460 --- /dev/null +++ b/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj.DotSettings @@ -0,0 +1,2 @@ + + Latest \ No newline at end of file diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj b/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj index 4b41172..7a422dc 100644 --- a/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj +++ b/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj @@ -3,9 +3,8 @@ Facepunch.Steamworks.Win64 $(DefineConstants);PLATFORM_WIN64;PLATFORM_WIN;PLATFORM_64 - netstandard2.0;net46 - true - 7.1 + netstandard2.1;net6.0 + true true true Steamworks @@ -19,7 +18,7 @@ https://github.com/Facepunch/Facepunch.Steamworks Facepunch.Steamworks.jpg facepunch;steam;unity;steamworks;valve - latest + 10 MIT https://github.com/Facepunch/Facepunch.Steamworks.git git diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj.DotSettings b/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj.DotSettings new file mode 100644 index 0000000..195c460 --- /dev/null +++ b/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj.DotSettings @@ -0,0 +1,2 @@ + + Latest \ No newline at end of file diff --git a/Generator/App.config b/Generator/App.config deleted file mode 100644 index 88fa402..0000000 --- a/Generator/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Generator/Generator.csproj b/Generator/Generator.csproj index 7e014e4..e1199b0 100644 --- a/Generator/Generator.csproj +++ b/Generator/Generator.csproj @@ -1,86 +1,13 @@ - - - + - Debug - AnyCPU - {B7225D11-2AAA-49D6-AE93-A73696EA35FE} + net6.0 Exe - Properties - Generator - Generator - v4.5.2 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false + 10 - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Generator/Generator.csproj.DotSettings b/Generator/Generator.csproj.DotSettings new file mode 100644 index 0000000..195c460 --- /dev/null +++ b/Generator/Generator.csproj.DotSettings @@ -0,0 +1,2 @@ + + Latest \ No newline at end of file diff --git a/Generator/Generator.csproj.old b/Generator/Generator.csproj.old new file mode 100644 index 0000000..75db3ac --- /dev/null +++ b/Generator/Generator.csproj.old @@ -0,0 +1,86 @@ + + + + + Debug + AnyCPU + {B7225D11-2AAA-49D6-AE93-A73696EA35FE} + Exe + Properties + Generator + Generator + v4.5.2 + 512 + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1a1d023356293ab6691f9806a7e33bc5b8b65e58 Mon Sep 17 00:00:00 2001 From: Jason Thompson Date: Thu, 9 Sep 2021 19:31:21 -0500 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 77ad32f..fc5a999 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [Another fucking c# Steamworks implementation](https://wiki.facepunch.com/steamworks/) -![Build All](https://github.com/Facepunch/Facepunch.Steamworks/workflows/Build%20All/badge.svg) +![Build All](https://github.com/Crytilis/Facepunch.Steamworks/workflows/Build%20All/badge.svg) ## Features From 42c7755a58475cfd450555f86dce8ff299d4295f Mon Sep 17 00:00:00 2001 From: Jason Thompson Date: Thu, 9 Sep 2021 19:38:52 -0500 Subject: [PATCH 3/7] Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index e25bf74..0bfc72c 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -6,10 +6,16 @@ jobs: build: runs-on: windows-latest - + steps: - uses: actions/checkout@v2 - + - name: Setup dotnet 6.x + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.x' + - name: Display dotnet version + run: dotnet --version + - name: setup-msbuild uses: microsoft/setup-msbuild@v1 @@ -30,4 +36,4 @@ jobs: - uses: actions/upload-artifact@v1 with: name: Compiled Files - path: Facepunch.Steamworks/bin \ No newline at end of file + path: Facepunch.Steamworks/bin From dd613232d3c7c1968b880e689d5a7d3905104ddc Mon Sep 17 00:00:00 2001 From: Jason Thompson Date: Thu, 9 Sep 2021 19:42:30 -0500 Subject: [PATCH 4/7] Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 0bfc72c..274e184 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -9,10 +9,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup dotnet 6.x + - name: Setup dotnet 6.0.x uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.x' + dotnet-version: '6.0.x' + include-prerelease: true - name: Display dotnet version run: dotnet --version From e96d97c5b5bf2dc495813ac196178c9a4724ce38 Mon Sep 17 00:00:00 2001 From: Jason Thompson Date: Thu, 9 Sep 2021 19:45:31 -0500 Subject: [PATCH 5/7] Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 274e184..c90fb59 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -28,11 +28,11 @@ jobs: run: dotnet restore Facepunch.Steamworks\Facepunch.Steamworks.Posix.csproj - name: Build Win64 - run: msbuild Facepunch.Steamworks\Facepunch.Steamworks.Win64.csproj + run: dotnet build Facepunch.Steamworks\Facepunch.Steamworks.Win64.csproj - name: Build Win32 - run: msbuild Facepunch.Steamworks\Facepunch.Steamworks.Win32.csproj + run: dotnet build Facepunch.Steamworks\Facepunch.Steamworks.Win32.csproj - name: Build Posix - run: msbuild Facepunch.Steamworks\Facepunch.Steamworks.Posix.csproj + run: dotnet build Facepunch.Steamworks\Facepunch.Steamworks.Posix.csproj - uses: actions/upload-artifact@v1 with: From 21fb722e3fd985c3b8ea132754affe8177e132c9 Mon Sep 17 00:00:00 2001 From: Jason Thompson Date: Thu, 9 Sep 2021 19:48:00 -0500 Subject: [PATCH 6/7] Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index c90fb59..11ee059 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -14,11 +14,6 @@ jobs: with: dotnet-version: '6.0.x' include-prerelease: true - - name: Display dotnet version - run: dotnet --version - - - name: setup-msbuild - uses: microsoft/setup-msbuild@v1 - name: Restore Win64 run: dotnet restore Facepunch.Steamworks\Facepunch.Steamworks.Win64.csproj From a51ccbb69dcbd0a1a67bd5b4d5004056e3a0c1e9 Mon Sep 17 00:00:00 2001 From: Garry Newman Date: Fri, 24 Sep 2021 13:40:27 +0100 Subject: [PATCH 7/7] Remove unused --- ...ch.Steamworks.TestWin32.csproj.DotSettings | 2 - .../Facepunch.Steamworks.TestWin32.csproj.old | 156 ------------------ ...ch.Steamworks.TestWin64.csproj.DotSettings | 2 - .../Facepunch.Steamworks.TestWin64.csproj.old | 156 ------------------ ...epunch.Steamworks.Posix.csproj.DotSettings | 2 - ...epunch.Steamworks.Win32.csproj.DotSettings | 2 - ...epunch.Steamworks.Win64.csproj.DotSettings | 2 - Generator/Generator.csproj.DotSettings | 2 - Generator/Generator.csproj.old | 86 ---------- 9 files changed, 410 deletions(-) delete mode 100644 Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.DotSettings delete mode 100644 Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.old delete mode 100644 Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.DotSettings delete mode 100644 Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.old delete mode 100644 Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj.DotSettings delete mode 100644 Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj.DotSettings delete mode 100644 Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj.DotSettings delete mode 100644 Generator/Generator.csproj.DotSettings delete mode 100644 Generator/Generator.csproj.old diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.DotSettings b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.DotSettings deleted file mode 100644 index 195c460..0000000 --- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - Latest \ No newline at end of file diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.old b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.old deleted file mode 100644 index 7968e36..0000000 --- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin32.csproj.old +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - AnyCPU - {3F6183AD-D966-44F2-A6EB-42E61E591B49} - Library - Properties - Facepunch.Steamworks.TestWin32 - Facepunch.Steamworks.TestWin32 - v4.6 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - - true - full - false - bin\Debug\ - TRACE;DEBUG;TEST_WIN32 - prompt - 4 - x86 - true - - - pdbonly - true - bin\Release\ - TRACE;TEST_WIN32 - prompt - 4 - x64 - true - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - - ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - ..\packages\Newtonsoft.Json.9.0.2-beta1\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2d6247f6-8ab2-405f-a00e-3a364b808a55} - Facepunch.Steamworks.Win32 - - - - - Always - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.DotSettings b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.DotSettings deleted file mode 100644 index 195c460..0000000 --- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - Latest \ No newline at end of file diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.old b/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.old deleted file mode 100644 index 76e0bb3..0000000 --- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.TestWin64.csproj.old +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - AnyCPU - {165081E3-BD96-404B-B83E-A635F1AF7CDE} - Library - Properties - Facepunch.Steamworks.TestWin64 - Facepunch.Steamworks.TestWin64 - v4.6 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - - true - full - false - bin\Debug\ - TRACE;DEBUG;TEST_WIN64 - prompt - 4 - x64 - true - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - x64 - true - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - - ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.2.0.0-beta4\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - ..\packages\Newtonsoft.Json.9.0.2-beta1\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {8c73da93-73ad-4445-9a2c-15d4a44337d3} - Facepunch.Steamworks.Win64 - - - - - Always - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj.DotSettings b/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj.DotSettings deleted file mode 100644 index 195c460..0000000 --- a/Facepunch.Steamworks/Facepunch.Steamworks.Posix.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - Latest \ No newline at end of file diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj.DotSettings b/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj.DotSettings deleted file mode 100644 index 195c460..0000000 --- a/Facepunch.Steamworks/Facepunch.Steamworks.Win32.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - Latest \ No newline at end of file diff --git a/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj.DotSettings b/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj.DotSettings deleted file mode 100644 index 195c460..0000000 --- a/Facepunch.Steamworks/Facepunch.Steamworks.Win64.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - Latest \ No newline at end of file diff --git a/Generator/Generator.csproj.DotSettings b/Generator/Generator.csproj.DotSettings deleted file mode 100644 index 195c460..0000000 --- a/Generator/Generator.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - Latest \ No newline at end of file diff --git a/Generator/Generator.csproj.old b/Generator/Generator.csproj.old deleted file mode 100644 index 75db3ac..0000000 --- a/Generator/Generator.csproj.old +++ /dev/null @@ -1,86 +0,0 @@ - - - - - Debug - AnyCPU - {B7225D11-2AAA-49D6-AE93-A73696EA35FE} - Exe - Properties - Generator - Generator - v4.5.2 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file