Update frameworks

robertcoltheart · Feb 25, 2022 · 534e7ff · 534e7ff
1 parent d2c2234
commit 534e7ff
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 17 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,10 +3,10 @@
   "isRoot": true,
   "tools": {
     "gitversion.tool": {
-      "version": "5.7.0",
+      "version": "5.8.2",
       "commands": [
         "dotnet-gitversion"
       ]
     }
   }
-}
+}
diff --git a/build/build.csproj b/build/build.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Bullseye" Version="3.8.0" />
     <PackageReference Include="SimpleExec" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
+    <PackageReference Include="System.Text.Json" Version="6.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Prefab/Prefab.csproj b/src/Prefab/Prefab.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-
     <PackageType>Template</PackageType>
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>

diff --git a/src/Prefab/templates/prefab/.config/dotnet-tools.json b/src/Prefab/templates/prefab/.config/dotnet-tools.json
@@ -3,10 +3,10 @@
   "isRoot": true,
   "tools": {
     "gitversion.tool": {
-      "version": "5.7.0",
+      "version": "5.8.2",
       "commands": [
         "dotnet-gitversion"
       ]
     }
   }
-}
+}
diff --git a/src/Prefab/templates/prefab/.github/workflows/build.yml b/src/Prefab/templates/prefab/.github/workflows/build.yml
@@ -12,15 +12,15 @@ env:
 jobs:
   build:
     name: build
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Fetch all tags and branches
         run: git fetch --prune --unshallow
       - name: Build
-        run: ./build.sh
+        run: ./build.ps1
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:

diff --git a/src/Prefab/templates/prefab/.github/workflows/publish.yml b/src/Prefab/templates/prefab/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   publish:
     name: publish
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
       - name: Checkout
@@ -20,7 +20,7 @@ jobs:
       - name: Deploy
         env:
           NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
-        run: ./build.sh publish
+        run: ./build.ps1 publish
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:

diff --git a/src/Prefab/templates/prefab/build/build.csproj b/src/Prefab/templates/prefab/build/build.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Bullseye" Version="3.8.0" />
     <PackageReference Include="SimpleExec" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="5.0.2" />
+    <PackageReference Include="System.Text.Json" Version="6.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Prefab/templates/prefab/src/Prefab.Tests/Prefab.Tests.csproj b/src/Prefab/templates/prefab/src/Prefab.Tests/Prefab.Tests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/Prefab/templates/prefab/src/Prefab/Prefab.csproj b/src/Prefab/templates/prefab/src/Prefab/Prefab.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Version>1.0.0</Version>
-    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Roslynator.Analyzers" Version="3.2.2">
+    <PackageReference Include="Roslynator.Analyzers" Version="4.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>