Merge branch 'develop'

asherber · Aug 18, 2024 · ddbb719 · ddbb719
2 parents 6cf9335 + fcf0309
commit ddbb719
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -4,29 +4,36 @@ env:
   DOTNET_NOLOGO: 1
 jobs:
   Build:
-    runs-on: windows-2022
+    runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Restore cache
-        uses: actions/cache@v2
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8
+
+      - name: NuGet cache
+        uses: actions/cache@v4
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
           restore-keys: |
             ${{ runner.os }}-nuget-
 
       - name: Build
-        run: dotnet build
+        run: |
+          dotnet restore --locked-mode
+          dotnet build
         
       - name: Test
         run: dotnet test --no-build -v normal --logger trx
 
       - name: Publish unit test report
-        uses: dorny/test-reporter@v1
+        uses: dorny/test-reporter@v1.9
         if: success() || failure()
         with:
           name: Unit Test Report

diff --git a/StaTypPocoQueries.PetaPoco.Tests/StaTypPocoQueries.PetaPoco.Tests.csproj b/StaTypPocoQueries.PetaPoco.Tests/StaTypPocoQueries.PetaPoco.Tests.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;net462</TargetFrameworks>
-	  <IsPackable>false</IsPackable>
+	<IsPackable>false</IsPackable>
+	<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/StaTypPocoQueries.PetaPoco/StaTypPocoQueries.PetaPoco.csproj b/StaTypPocoQueries.PetaPoco/StaTypPocoQueries.PetaPoco.csproj
@@ -14,15 +14,16 @@
     <PackageIcon>static-64.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageTags>petapoco statyppocoqueries statically typed</PackageTags>
-    <PackageReleaseNotes>Upgrade base library to v2</PackageReleaseNotes>    
+    <PackageReleaseNotes>Upgrade base library to v2</PackageReleaseNotes>   
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DocumentationFile>$(AssemblyName).xml</DocumentationFile>
     <NoWarn>1701;1702;1591;1570;1587;CS1573</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net45" Version="1.0.2">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net45" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/StaTypPocoQueries.PetaPoco/packages.lock.json b/StaTypPocoQueries.PetaPoco/packages.lock.json
@@ -4,18 +4,18 @@
     ".NETFramework,Version=v4.5": {
       "Microsoft.NETFramework.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.0.2, )",
-        "resolved": "1.0.2",
-        "contentHash": "5/cSEVld+px/CuRrbohO/djfg6++eR6zGpy88MgqloXvkj//WXWpFZyu/OpkXPN0u5m+dN/EVwLNYFUxD4h2+A==",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
         "dependencies": {
-          "Microsoft.NETFramework.ReferenceAssemblies.net45": "1.0.2"
+          "Microsoft.NETFramework.ReferenceAssemblies.net45": "1.0.3"
         }
       },
       "Microsoft.NETFramework.ReferenceAssemblies.net45": {
         "type": "Direct",
-        "requested": "[1.0.2, )",
-        "resolved": "1.0.2",
-        "contentHash": "Nm14pRmqB+4u2JEMdtngnbDcJidTmswMxOJ992TpTwiwcUTERxLlHwwSh0HiUoRjS0TO0sozsiB0h6FHjCUdEA=="
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "dcSLNuUX2rfZejsyta2EWZ1W5U6ucbFt697lRg1qiTlTM5ZlYv4uAvuxE6ROy6xLWWhLhOaReCDxkhxcajRYtQ=="
       },
       "Nerdbank.GitVersioning": {
         "type": "Direct",
@@ -53,9 +53,9 @@
     ".NETStandard,Version=v2.0": {
       "Microsoft.NETFramework.ReferenceAssemblies.net45": {
         "type": "Direct",
-        "requested": "[1.0.2, )",
-        "resolved": "1.0.2",
-        "contentHash": "Nm14pRmqB+4u2JEMdtngnbDcJidTmswMxOJ992TpTwiwcUTERxLlHwwSh0HiUoRjS0TO0sozsiB0h6FHjCUdEA=="
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "dcSLNuUX2rfZejsyta2EWZ1W5U6ucbFt697lRg1qiTlTM5ZlYv4uAvuxE6ROy6xLWWhLhOaReCDxkhxcajRYtQ=="
       },
       "Nerdbank.GitVersioning": {
         "type": "Direct",