Merge template/faithlife-build.

ejball · ejball · commit 88775b758fb8 · 2022-12-30T12:35:47.000-08:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -30,10 +30,10 @@ jobs:
       uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    - name: Set up .NET 6
+    - name: Set up .NET 7
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Restore
       run: .\build.ps1 restore
     - name: Build
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <VersionPrefix>2.5.0</VersionPrefix>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <NoWarn>$(NoWarn);1591;1998;NU5105;CA1014;CA1508</NoWarn>
+    <NoWarn>$(NoWarn);1591;1998;NU5105;CA1014;CA1508;CA1852</NoWarn>
     <DebugType>embedded</DebugType>
     <GitHubOrganization>FacilityApi</GitHubOrganization>
     <RepositoryName>FacilityJavaScript</RepositoryName>
diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "jetbrains.resharper.globaltools": {
-      "version": "2022.2.3",
+      "version": "2022.3.1",
       "commands": [
         "jb"
       ]
diff --git a/tools/Build/Build.csproj b/tools/Build/Build.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Faithlife.Build" Version="5.14.7" />
+    <PackageReference Include="Faithlife.Build" Version="5.16.1" />
   </ItemGroup>
 
 </Project>
diff --git a/tools/XmlDocGen/XmlDocGen.csproj b/tools/XmlDocGen/XmlDocGen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`]`
`10`	`10`	`},`
`11`	`11`	`"jetbrains.resharper.globaltools": {`
`12`		`- "version": "2022.2.3",`
	`12`	`+ "version": "2022.3.1",`
`13`	`13`	`"commands": [`
`14`	`14`	`"jb"`
`15`	`15`	`]`