update the project to net7.0 (#439)

microsoft · Dec 14, 2022 · 0f700c0 · 0f700c0
1 parent ccfd2bd
commit 0f700c0
Show file tree

Hide file tree

Showing 67 changed files with 278 additions and 224 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "dotnet-ilverify": {
-      "version": "6.0.0",
+      "version": "7.0.0",
       "commands": [
         "ilverify"
       ]

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -26,10 +26,10 @@ jobs:
       uses: NuGet/setup-nuget@v1
       with:
         nuget-version: '6.x'
-    - name: Setup .NET 6.0 SDK
+    - name: Setup .NET 7.0 SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
     - name: Set environment variables
       run: echo "COYOTE_CLI_TELEMETRY_OPTOUT=1" >> $GITHUB_ENV
     # Initializes the CodeQL tools for scanning.

diff --git a/.github/workflows/test-coyote.yml b/.github/workflows/test-coyote.yml
@@ -30,6 +30,10 @@ jobs:
         uses: NuGet/setup-nuget@v1
         with:
           nuget-version: '6.x'
+      - name: Setup .NET 7.0 SDK
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '7.0.x'
       - name: Setup .NET 6.0 SDK
         uses: actions/setup-dotnet@v1
         with:
@@ -77,10 +81,10 @@ jobs:
       COYOTE_CLI_TELEMETRY_OPTOUT: 1
     steps:
       - uses: actions/checkout@v2
-      - name: Setup .NET 6.0 SDK
+      - name: Setup .NET 7.0 SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '7.0.x'
       - name: Download Coyote binaries
         uses: actions/download-artifact@v3
         with:

diff --git a/.github/workflows/test-performance.yml b/.github/workflows/test-performance.yml
@@ -23,10 +23,10 @@ jobs:
         uses: NuGet/setup-nuget@v1
         with:
           nuget-version: '6.x'
-      - name: Setup .NET 6.0 SDK
+      - name: Setup .NET 7.0 SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '7.0.x'
       - name: Setup Powershell
         run: ./Scripts/install-pwsh.cmd
       - name: Build Coyote projects

diff --git a/Common/build.props b/Common/build.props
@@ -16,10 +16,10 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageOutputPath>$(MSBuildThisFileDirectory)/../bin/nuget</PackageOutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net6.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' != 'net7.0' and '$(TargetFramework)' != 'net6.0'">
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
@@ -44,14 +44,14 @@
     <NetCore31Installed>false</NetCore31Installed>
     <NetCore31Installed Condition="$(GlobalVersion.StartsWith('3.1'))">true</NetCore31Installed>
     <NetCore31Installed Condition="'$(BUILD_NETCORE31)'=='yes'">true</NetCore31Installed>
-    <!-- <Net5Supported Condition="'$(Net5Supported)'==''">true</Net5Supported>
-    <Net5Installed>false</Net5Installed>
-    <Net5Installed Condition="$(GlobalVersion.StartsWith('5.0'))">true</Net5Installed>
-    <Net5Installed Condition="'$(BUILD_NET5)'=='yes'">true</Net5Installed> -->
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <Net6Supported Condition="'$(Net6Supported)'==''">true</Net6Supported>
+    <Net6Installed>false</Net6Installed>
+    <Net6Installed Condition="$(GlobalVersion.StartsWith('6.0'))">true</Net6Installed>
+    <Net6Installed Condition="'$(BUILD_NET6)'=='yes'">true</Net6Installed>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(NetStandard2Supported)'">$(TargetFrameworks);netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(NetCore31Installed)' and '$(NetCore31Supported)'">$(TargetFrameworks);netcoreapp3.1</TargetFrameworks>
-    <!-- <TargetFrameworks Condition="'$(Net5Installed)' and '$(Net5Supported)'">$(TargetFrameworks);net5.0</TargetFrameworks> -->
+    <TargetFrameworks Condition="'$(Net6Installed)' and '$(Net6Supported)'">$(TargetFrameworks);net6.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(OS)'=='Windows_NT'">
     <TargetFrameworks Condition="'$(Framework462Installed)' and '$(Framework462Supported)'">$(TargetFrameworks);net462</TargetFrameworks>

diff --git a/History.md b/History.md
@@ -1,3 +1,6 @@
+## vNext
+- Added support for the `net7.0` target framework.
+
 ## v1.7.2
 - Added support for fully controlling the `SemaphoreSlim` type during testing.
 - Added support for detecting the `System.Guid` and `System.DateTime` APIs as sources of

diff --git a/Samples/AccountManager/AccountManager.ETags/AccountManager.ETags.csproj b/Samples/AccountManager/AccountManager.ETags/AccountManager.ETags.csproj
@@ -19,7 +19,7 @@
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="7.0.1" />
     <PackageReference Include="xunit.assert" Version="2.4.2" />
   </ItemGroup>
 </Project>
diff --git a/Samples/CloudMessaging/run-mock.cmd b/Samples/CloudMessaging/run-mock.cmd
@@ -1,2 +1,2 @@
 cd %~dp0
-dotnet ..\..\bin\net6.0\coyote.dll test /../bin/net6.0/Raft.Mocking.dll -i 1000 -ms 500 -graph-bug
+dotnet ..\..\bin\net7.0\coyote.dll test /../bin/net7.0/Raft.Mocking.dll -i 1000 -ms 500 -graph-bug
diff --git a/Samples/CloudMessaging/run-nondeterminism.cmd b/Samples/CloudMessaging/run-nondeterminism.cmd
@@ -1,2 +1,2 @@
 cd %~dp0
-dotnet ..\..\bin\net6.0\coyote.dll test ../bin/net6.0/Raft.Nondeterminism.dll -i 1000 -ms 500 -graph-bug
+dotnet ..\..\bin\net7.0\coyote.dll test ../bin/net7.0/Raft.Nondeterminism.dll -i 1000 -ms 500 -graph-bug
diff --git a/Samples/CloudMessaging/run.cmd b/Samples/CloudMessaging/run.cmd
@@ -1 +1 @@
-dotnet %~dp0\..\bin\net6.0\Raft.Azure.dll --connection-string %CONNECTION_STRING% --topic-name rafttopic --num-requests 5 --local-cluster-size 5 
+dotnet %~dp0\..\bin\net7.0\Raft.Azure.dll --connection-string %CONNECTION_STRING% --topic-name rafttopic --num-requests 5 --local-cluster-size 5 
diff --git a/Samples/Common/TestDriver/rewrite.coyote.json b/Samples/Common/TestDriver/rewrite.coyote.json
@@ -1,5 +1,5 @@
 {
-  "AssembliesPath": "../bin/net6.0",
+  "AssembliesPath": "../bin/net7.0",
   "Assemblies": [
     "AccountManager.dll",
     "AccountManager.ETags.dll",

diff --git a/Samples/Common/build.props b/Samples/Common/build.props
@@ -5,7 +5,7 @@
     <Company>Microsoft Corporation</Company>
     <Copyright>Copyright © Microsoft Corporation.</Copyright>
     <LangVersion>10.0</LangVersion>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net7.0</TargetFrameworks>
     <UseLocalCoyote>False</UseLocalCoyote>
     <UseLocalNugetPackages>False</UseLocalNugetPackages>
     <UseNugetPackages>True</UseNugetPackages>

diff --git a/Samples/README.md b/Samples/README.md
@@ -35,8 +35,8 @@ to build reliable applications and services:
 
 To build and run the samples, you will need to:
 
-- Install the [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet).
-- Install the [.NET 6.0 version of the coyote
+- Install the [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet).
+- Install the [.NET 7.0 version of the coyote
   tool](https://microsoft.github.io/coyote/get-started/install/).
 
 Once you are ready, build the samples by running the following script from the root of the

diff --git a/Samples/Scripts/run-tests.ps1 b/Samples/Scripts/run-tests.ps1
@@ -7,7 +7,7 @@ CheckPSVersion
 
 Write-Comment -prefix "." -text "Testing the Coyote samples" -color "yellow"
 
-$framework = "net6.0"
+$framework = "net7.0"
 $tests = "$PSScriptRoot/../Common/bin/$framework/TestDriver.dll"
 if (-not (Test-Path $tests)) {
     Write-Error "tests for the Coyote samples not found."

diff --git a/Samples/WebApps/ImageGalleryAspNet/ImageGallery/design.dgml b/Samples/WebApps/ImageGalleryAspNet/ImageGallery/design.dgml
@@ -48,7 +48,7 @@
     <Node Id="@36" Category="CodeSchema_Namespace" Bounds="773.927185201584,490.713883260739,740.406808803008,298.840566741276" DelayedChildNodesState="Fetched" DelayedCrossGroupLinksState="Fetched" FetchedChildrenCount="8" Group="Expanded" Label="ImageGallery‎.Store‎.Cosmos" UseManualLocation="True" />
     <Node Id="@37" Category="CodeSchema_Namespace" Bounds="320.695885131207,974.343676357855,176.473333333333,140.0003" DelayedChildNodesState="Fetched" DelayedCrossGroupLinksState="Fetched" FetchedChildrenCount="2" Group="Expanded" Label="ImageGallery‎.Tests" UseManualLocation="True" />
     <Node Id="@38" Category="CodeSchema_Namespace" Bounds="280.053178930798,1181.14193404704,265.356666666667,85.0002" DelayedChildNodesState="Fetched" DelayedCrossGroupLinksState="Fetched" FetchedChildrenCount="1" Group="Expanded" Label="ImageGallery‎.Tests‎.Mocks‎.AzureStorage" />
-    <Node Id="@4" Category="CodeSchema_Assembly" Bounds="1558.10211411794,987.249543980297,282.306666666668,250.9604999995" CodeSchemaProperty_IsExternal="True" CodeSchemaProperty_StrongName="Azure.Storage.Blobs, Version=12.6.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8" DelayedChildNodesState="Incomplete" DelayedCrossGroupLinksState="Fetched" FilePath="C:\git\foundry99\CoyoteSamples\packages\azure.storage.blobs\12.6.0\lib\netstandard2.0\Azure.Storage.Blobs.dll" Group="Expanded" Label="Azure.Storage.Blobs.dll" UseManualLocation="True">
+    <Node Id="@4" Category="CodeSchema_Assembly" Bounds="1558.10211411794,987.249543980297,282.306666666668,250.9604999995" CodeSchemaProperty_IsExternal="True" CodeSchemaProperty_StrongName="Azure.Storage.Blobs, Version=12.6.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8" DelayedChildNodesState="Incomplete" DelayedCrossGroupLinksState="Fetched" FilePath="C:\git\microsoft\CoyoteSamples\packages\azure.storage.blobs\12.6.0\lib\netstandard2.0\Azure.Storage.Blobs.dll" Group="Expanded" Label="Azure.Storage.Blobs.dll" UseManualLocation="True">
       <Category Ref="FileSystem.Category.FileOfType.dll" />
     </Node>
     <Node Id="@40" Category="CodeSchema_Namespace" Bounds="575.409845597464,1046.72182699855,504.586666666667,353.8403" DelayedChildNodesState="Fetched" DelayedCrossGroupLinksState="Fetched" FetchedChildrenCount="4" Group="Expanded" Label="ImageGallery‎.Tests‎.Mocks‎.Cosmos" />
@@ -88,7 +88,7 @@
     <Node Id="@77" Category="CodeSchema_Class" Bounds="210.295453208094,564.611686405997,160.766666666666,25" CodeSchemaProperty_IsPublic="True" DelayedChildNodesState="NotFetched" DelayedCrossGroupLinksState="Fetched" Group="Collapsed" Label="ImageGalleryClient" />
     <Node Id="@78" Category="CodeSchema_Class" Bounds="176.437119874758,734.61208640555,111.696666666667,25" CodeSchemaProperty_IsPublic="True" DelayedChildNodesState="Incomplete" DelayedCrossGroupLinksState="Fetched" Group="Collapsed" Label="ImageList" />
     <Node Id="@79" Category="CodeSchema_Class" Bounds="307.808178930798,1221.14203404704,209.846666666667,25" CodeSchemaProperty_IsInternal="True" DelayedChildNodesState="NotFetched" DelayedCrossGroupLinksState="Fetched" Group="Collapsed" Label="MockBlobContainerProvider" />
-    <Node Id="@8" Category="CodeSchema_Assembly" Bounds="1225.89527256953,923.54879414669,249.660030705313,156.9203" CodeSchemaProperty_IsExternal="True" CodeSchemaProperty_StrongName="Microsoft.Azure.Cosmos.Client, Version=3.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" DelayedChildNodesState="Incomplete" DelayedCrossGroupLinksState="Fetched" FilePath="C:\git\foundry99\CoyoteSamples\packages\microsoft.azure.cosmos\3.12.0\ref\netstandard2.0\Microsoft.Azure.Cosmos.Client.dll" Group="Expanded" Label="Microsoft.Azure.Cosmos.Client.dll" UseManualLocation="True">
+    <Node Id="@8" Category="CodeSchema_Assembly" Bounds="1225.89527256953,923.54879414669,249.660030705313,156.9203" CodeSchemaProperty_IsExternal="True" CodeSchemaProperty_StrongName="Microsoft.Azure.Cosmos.Client, Version=3.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" DelayedChildNodesState="Incomplete" DelayedCrossGroupLinksState="Fetched" FilePath="C:\git\microsoft\CoyoteSamples\packages\microsoft.azure.cosmos\3.12.0\ref\netstandard2.0\Microsoft.Azure.Cosmos.Client.dll" Group="Expanded" Label="Microsoft.Azure.Cosmos.Client.dll" UseManualLocation="True">
       <Category Ref="FileSystem.Category.FileOfType.dll" />
     </Node>
     <Node Id="@80" Category="CodeSchema_Class" Bounds="637.789845597465,1190.56202699855,164.783333333333,25" CodeSchemaProperty_IsInternal="True" DelayedChildNodesState="NotFetched" DelayedCrossGroupLinksState="Fetched" Group="Collapsed" Label="MockClientProvider" />
@@ -524,11 +524,11 @@
   <IdentifierAliases>
     <Alias n="1" Uri="Assembly=$(e140c75e-8fc0-4c25-a744-2172d419a56a.OutputPathUri)" />
     <Alias n="2" Id="(@1)" />
-    <Alias n="3" Uri="Assembly=file:///C:/git/foundry99/CoyoteSamples/packages/azure.storage.blobs/12.6.0/lib/netstandard2.0/Azure.Storage.Blobs.dll" />
+    <Alias n="3" Uri="Assembly=file:///C:/git/microsoft/CoyoteSamples/packages/azure.storage.blobs/12.6.0/lib/netstandard2.0/Azure.Storage.Blobs.dll" />
     <Alias n="4" Id="(@3)" />
     <Alias n="5" Uri="Assembly=$(b61697f0-7146-4c6a-8b6f-22f47731b799.OutputPathUri)" />
     <Alias n="6" Id="(@5)" />
-    <Alias n="7" Uri="Assembly=file:///C:/git/foundry99/CoyoteSamples/packages/microsoft.azure.cosmos/3.12.0/ref/netstandard2.0/Microsoft.Azure.Cosmos.Client.dll" />
+    <Alias n="7" Uri="Assembly=file:///C:/git/microsoft/CoyoteSamples/packages/microsoft.azure.cosmos/3.12.0/ref/netstandard2.0/Microsoft.Azure.Cosmos.Client.dll" />
     <Alias n="8" Id="(@7)" />
     <Alias n="9" Uri="Assembly=$(a5b18c87-5523-45ca-ad7c-ba9f9cd970f0.OutputPathUri)" />
     <Alias n="10" Id="(@9)" />
@@ -617,7 +617,7 @@
     <Alias n="93" Id="(@1 @21 @44 Member=(Name=Create OverloadingParameters=[@43]))" />
     <Alias n="94" Id="(@1 @21 @44 Member=(Name=Update OverloadingParameters=[@43]))" />
     <Alias n="95" Id="(@1 @21 @67 Member=(Name=Store OverloadingParameters=[@76]))" />
-    <Alias n="96" Uri="Assembly=file:///C:/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/ref/netcoreapp3.1/System.Runtime.dll" />
+    <Alias n="96" Uri="Assembly=file:///C:/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/7.0.100/ref/net7.0/System.Runtime.dll" />
     <Alias n="97" Id="(@96 Namespace=System Type=String)" />
     <Alias n="98" Id="OverloadingParameters=[@97]" />
     <Alias n="99" Id="(@1 @21 @44 Member=(Name=Get @98))" />
@@ -869,13 +869,13 @@
     </Style>
   </Styles>
   <Paths>
-    <Path Id="a5b18c87-5523-45ca-ad7c-ba9f9cd970f0.OutputPath" Value="C:\git\foundry99\CoyoteSamples\ImageGalleryAspNet\bin\netcoreapp3.1\ImageGalleryClient.dll" />
-    <Path Id="a5b18c87-5523-45ca-ad7c-ba9f9cd970f0.OutputPathUri" Value="file:///C:/git/foundry99/CoyoteSamples/ImageGalleryAspNet/bin/netcoreapp3.1/ImageGalleryClient.dll" />
-    <Path Id="b61697f0-7146-4c6a-8b6f-22f47731b799.OutputPath" Value="C:\git\foundry99\CoyoteSamples\ImageGalleryAspNet\bin\netcoreapp3.1\ImageGalleryTests.dll" />
-    <Path Id="b61697f0-7146-4c6a-8b6f-22f47731b799.OutputPathUri" Value="file:///C:/git/foundry99/CoyoteSamples/ImageGalleryAspNet/bin/netcoreapp3.1/ImageGalleryTests.dll" />
-    <Path Id="c1ca4fb9-7c59-425f-b437-04cc48ba1988.OutputPath" Value="C:\git\foundry99\CoyoteSamples\ImageGalleryAspNet\ImageGallery\bin\Debug\netcoreapp3.1\ImageGallery.dll" />
-    <Path Id="c1ca4fb9-7c59-425f-b437-04cc48ba1988.OutputPathUri" Value="file:///C:/git/foundry99/CoyoteSamples/ImageGalleryAspNet/ImageGallery/bin/Debug/netcoreapp3.1/ImageGallery.dll" />
-    <Path Id="e140c75e-8fc0-4c25-a744-2172d419a56a.OutputPath" Value="C:\git\foundry99\CoyoteSamples\ImageGalleryAspNet\bin\netcoreapp3.1\ImageGalleryService.dll" />
-    <Path Id="e140c75e-8fc0-4c25-a744-2172d419a56a.OutputPathUri" Value="file:///C:/git/foundry99/CoyoteSamples/ImageGalleryAspNet/bin/netcoreapp3.1/ImageGalleryService.dll" />
+    <Path Id="a5b18c87-5523-45ca-ad7c-ba9f9cd970f0.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\bin\net7.0\ImageGalleryClient.dll" />
+    <Path Id="a5b18c87-5523-45ca-ad7c-ba9f9cd970f0.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/bin/net7.0/ImageGalleryClient.dll" />
+    <Path Id="b61697f0-7146-4c6a-8b6f-22f47731b799.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\bin\net7.0\ImageGalleryTests.dll" />
+    <Path Id="b61697f0-7146-4c6a-8b6f-22f47731b799.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/bin/net7.0/ImageGalleryTests.dll" />
+    <Path Id="c1ca4fb9-7c59-425f-b437-04cc48ba1988.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\ImageGallery\bin\Debug\net7.0\ImageGallery.dll" />
+    <Path Id="c1ca4fb9-7c59-425f-b437-04cc48ba1988.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/ImageGallery/bin/Debug/net7.0/ImageGallery.dll" />
+    <Path Id="e140c75e-8fc0-4c25-a744-2172d419a56a.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\bin\net7.0\ImageGalleryService.dll" />
+    <Path Id="e140c75e-8fc0-4c25-a744-2172d419a56a.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/bin/net7.0/ImageGalleryService.dll" />
   </Paths>
 </DirectedGraph>
diff --git a/Samples/WebApps/ImageGalleryAspNet/ImageGallery/readme.md b/Samples/WebApps/ImageGalleryAspNet/ImageGallery/readme.md
@@ -8,7 +8,7 @@ This is a web client front end that uses the ImageGalleryService middle tier.
 
 The app depends on the following:
 
-- [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet) must be installed.
+- [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet) must be installed.
 - [Azure Storage Emulator](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator) must be hnstalled running.
 - [Azure Cosmos Emulator](https://docs.microsoft.com/en-us/azure/cosmos-db/local-emulator?tabs=cli%2Cssl-netstd21) must be installed and running.
 - Open Azure Cosmos Data Explorer from taskbar tray and copy the `Primary Connection String` from there into `~/ImageGalleryAspNet/ImageGalleryService/appsettings.json`.

diff --git a/Samples/WebApps/ImageGalleryAspNet/rewrite.coyote.json b/Samples/WebApps/ImageGalleryAspNet/rewrite.coyote.json
@@ -1,5 +1,5 @@
 {
-  "AssembliesPath": "./bin/net6.0",
+  "AssembliesPath": "./bin/net7.0",
   "OutputPath": "./bin/coyote",
   "Assemblies": [
       "ImageGalleryService.dll",

diff --git a/Samples/WebApps/PetImagesAspNet/PetImages.Tests/PetImages.Tests.csproj b/Samples/WebApps/PetImagesAspNet/PetImages.Tests/PetImages.Tests.csproj
@@ -10,8 +10,8 @@
     <ProjectReference Include="..\PetImages\PetImages.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />

diff --git a/Samples/WebApps/PetImagesAspNet/PetImages.Tests/rewrite.coyote.json b/Samples/WebApps/PetImagesAspNet/PetImages.Tests/rewrite.coyote.json
@@ -1,5 +1,5 @@
 {
-  "AssembliesPath": "./bin/net6.0",
+  "AssembliesPath": "./bin/net7.0",
   "Assemblies": [
     "PetImages.dll",
     "PetImages.Tests.dll"

diff --git a/Scripts/CI/azure-nuget-sign-publish.yml b/Scripts/CI/azure-nuget-sign-publish.yml
@@ -8,10 +8,15 @@ steps:
     versionSpec: 6.x
 
 - task: UseDotNet@2
-  displayName: 'Install .NET 6.0 SDK'
+  displayName: 'Install .NET 7.0 SDK'
   inputs:
     useGlobalJson: true
 
+- task: UseDotNet@2
+  displayName: 'Install .NET 6.0 SDK'
+  inputs:
+    version: 6.0.x
+
 - task: UseDotNet@2
   displayName: 'Install .NET Core 3.1 SDK'
   inputs:
@@ -28,6 +33,36 @@ steps:
     failOnStderr: true
     pwsh: true
 
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  displayName: 'ESRP CodeSigning .NET 7.0'
+  inputs:
+    ConnectedServiceName: CoyoteNugetSign
+    FolderPath: bin\net7.0
+    signConfigType: inlineSignParams
+    inlineOperation: |
+     [
+         {
+             "KeyCode": "CP-230012",
+             "OperationCode": "SigntoolSign",
+             "Parameters": {
+                 "OpusName": "Microsoft.Coyote",
+                 "OpusInfo": "https://github.com/Microsoft/Coyote",
+                 "FileDigest": "/fd \"SHA256\"",
+                 "PageHash": "/PH",
+                 "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+             },
+             "ToolName": "sign",
+             "ToolVersion": "1.0"
+         },
+         {
+             "KeyCode": "CP-230012",
+             "OperationCode": "SigntoolVerify",
+             "Parameters": {},
+             "ToolName": "sign",
+             "ToolVersion": "1.0"
+         }
+     ]
+
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   displayName: 'ESRP CodeSigning .NET 6.0'
   inputs: