From 601f22cdf4adb00d912f64d78b465e7b5ac14184 Mon Sep 17 00:00:00 2001
From: Zoltan Csizmadia <CsizmadiaZ@valassis.com>
Date: Tue, 8 Nov 2022 12:06:34 -0600
Subject: [PATCH 1/2] Upgrade to latest packages

---
 Directory.Build.props                                  |  1 +
 Versions.props                                         | 10 +++++-----
 .../WeatherForecastWebApi/WeatherForecastWebApi.csproj |  1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index dd7cf19..a668732 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -41,6 +41,7 @@
 
     <!-- By default none of the projects are packable by "dotnet pack". Packable projects must set it to true! -->
     <IsPackable>false</IsPackable>
+    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Versions.props b/Versions.props
index 005a57b..07ef958 100644
--- a/Versions.props
+++ b/Versions.props
@@ -7,14 +7,14 @@
   <!-- Run "dotnet list package (dash,dash)outdated" to see the latest versions of each package.-->
 	
   <PropertyGroup Label="Package Dependencies">
-    <SystemTextJsonVersion Condition="'$(SystemTextJsonVersion)' == ''">7.0.0-rc.*</SystemTextJsonVersion>
+    <SystemTextJsonVersion Condition="'$(SystemTextJsonVersion)' == ''">7.0.0</SystemTextJsonVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Build Dependencies">
-    <CoverletCollectorVersion Condition="'$(CoverletCollectorVersion)' == ''">3.1.*</CoverletCollectorVersion>
-    <MicrosoftNETTestSdkVersion Condition="'$(MicrosoftNETTestSdkVersion)' == ''">17.3.*</MicrosoftNETTestSdkVersion>
+    <CoverletCollectorVersion Condition="'$(CoverletCollectorVersion)' == ''">3.2.*</CoverletCollectorVersion>
+    <MicrosoftNETTestSdkVersion Condition="'$(MicrosoftNETTestSdkVersion)' == ''">17.4.*</MicrosoftNETTestSdkVersion>
     <NUnitVersion Condition="'$(NUnitVersion)' == ''">3.13.*</NUnitVersion>
-    <NUnit3TestAdapterVersion Condition="'$(NUnit3TestAdapterVersion)' == ''">4.2.*</NUnit3TestAdapterVersion>
-    <NUnitAnalyzersVersion Condition="'$(NUnitAnalyzersVersion)' == ''">3.3.*</NUnitAnalyzersVersion>
+    <NUnit3TestAdapterVersion Condition="'$(NUnit3TestAdapterVersion)' == ''">4.3.*</NUnit3TestAdapterVersion>
+    <NUnitAnalyzersVersion Condition="'$(NUnitAnalyzersVersion)' == ''">3.5.*</NUnitAnalyzersVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/sample/WeatherForecastWebApi/WeatherForecastWebApi.csproj b/sample/WeatherForecastWebApi/WeatherForecastWebApi.csproj
index de92996..883d09a 100644
--- a/sample/WeatherForecastWebApi/WeatherForecastWebApi.csproj
+++ b/sample/WeatherForecastWebApi/WeatherForecastWebApi.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
+    <OutputType>Exe</OutputType>
     <TargetFramework>$(SampleTargetFramework)</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

From 6869a1d477fdaf9fcdb0afd68729243801bd36ae Mon Sep 17 00:00:00 2001
From: Zoltan Csizmadia <CsizmadiaZ@valassis.com>
Date: Tue, 8 Nov 2022 12:09:39 -0600
Subject: [PATCH 2/2] Update setup-dotnet version

---
 .github/workflows/dotnet-codeql.yml | 3 +--
 .github/workflows/dotnet.yml        | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dotnet-codeql.yml b/.github/workflows/dotnet-codeql.yml
index a73eda1..0dac3a3 100644
--- a/.github/workflows/dotnet-codeql.yml
+++ b/.github/workflows/dotnet-codeql.yml
@@ -33,12 +33,11 @@ jobs:
 
     # Install .NET SDKs
     - name: Install .NET SDKs
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3.0.3
       with:
         dotnet-version: |
           6.0.x
           7.0.x
-        include-prerelease: true
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 5addc72..5193de3 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -15,12 +15,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3.0.3
       with:
         dotnet-version: |
           6.0.x
           7.0.x
-        include-prerelease: true
 
     - name: Install dependencies
       run: dotnet restore