diff --git a/Samples/AccountManager/AccountManager.ETags/AccountManager.ETags.csproj b/Samples/AccountManager/AccountManager.ETags/AccountManager.ETags.csproj
index 7eab020db..c6aab4a35 100644
--- a/Samples/AccountManager/AccountManager.ETags/AccountManager.ETags.csproj
+++ b/Samples/AccountManager/AccountManager.ETags/AccountManager.ETags.csproj
@@ -19,7 +19,6 @@
TRACE
-
\ No newline at end of file
diff --git a/Samples/WebApps/ImageGalleryAspNet/Tests.Coyote/Tests.Coyote.csproj b/Samples/WebApps/ImageGalleryAspNet/Tests.Coyote/Tests.Coyote.csproj
index 35957d92c..485f002d7 100644
--- a/Samples/WebApps/ImageGalleryAspNet/Tests.Coyote/Tests.Coyote.csproj
+++ b/Samples/WebApps/ImageGalleryAspNet/Tests.Coyote/Tests.Coyote.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/Samples/WebApps/ImageGalleryAspNet/Tests/Tests.csproj b/Samples/WebApps/ImageGalleryAspNet/Tests/Tests.csproj
index 1fac5ceda..de13db3bd 100644
--- a/Samples/WebApps/ImageGalleryAspNet/Tests/Tests.csproj
+++ b/Samples/WebApps/ImageGalleryAspNet/Tests/Tests.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/Samples/WebApps/PetImagesAspNet/PetImages.Tests/PetImages.Tests.csproj b/Samples/WebApps/PetImagesAspNet/PetImages.Tests/PetImages.Tests.csproj
index 3cde5c681..02b075ac4 100644
--- a/Samples/WebApps/PetImagesAspNet/PetImages.Tests/PetImages.Tests.csproj
+++ b/Samples/WebApps/PetImagesAspNet/PetImages.Tests/PetImages.Tests.csproj
@@ -12,7 +12,7 @@
-
+
diff --git a/Scripts/CI/azure-nuget-sign-publish.yml b/Scripts/CI/azure-nuget-sign-publish.yml
index d901d461c..205f322f9 100644
--- a/Scripts/CI/azure-nuget-sign-publish.yml
+++ b/Scripts/CI/azure-nuget-sign-publish.yml
@@ -10,7 +10,7 @@ steps:
- task: UseDotNet@2
displayName: 'Install .NET 7.0 SDK'
inputs:
- useGlobalJson: true
+ version: 7.0.x
- task: UseDotNet@2
displayName: 'Install .NET 6.0 SDK'
@@ -22,6 +22,11 @@ steps:
inputs:
version: 3.1.x
+- task: UseDotNet@2
+ displayName: 'Install .NET Core 2.1 SDK'
+ inputs:
+ version: 2.1.x
+
- task: PowerShell@2
displayName: 'Build Coyote projects'
inputs:
@@ -33,7 +38,7 @@ steps:
failOnStderr: true
pwsh: true
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: EsrpCodeSigning@2
displayName: 'ESRP CodeSigning .NET 7.0'
inputs:
ConnectedServiceName: CoyoteNugetSign
@@ -63,7 +68,7 @@ steps:
}
]
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: EsrpCodeSigning@2
displayName: 'ESRP CodeSigning .NET 6.0'
inputs:
ConnectedServiceName: CoyoteNugetSign
@@ -93,7 +98,7 @@ steps:
}
]
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: EsrpCodeSigning@2
displayName: 'ESRP CodeSigning .NET Core 3.1'
inputs:
ConnectedServiceName: CoyoteNugetSign
@@ -123,7 +128,7 @@ steps:
}
]
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: EsrpCodeSigning@2
displayName: 'ESRP CodeSigning .NET Standard 2.0'
inputs:
ConnectedServiceName: CoyoteNugetSign
@@ -153,7 +158,7 @@ steps:
}
]
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: EsrpCodeSigning@2
displayName: 'ESRP CodeSigning .NET 4.6.2'
inputs:
ConnectedServiceName: CoyoteNugetSign
@@ -183,7 +188,7 @@ steps:
}
]
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: EsrpCodeSigning@2
displayName: 'ESRP CodeSigning NuGet package'
inputs:
ConnectedServiceName: CoyoteNugetSign
diff --git a/Source/Test/Test.csproj b/Source/Test/Test.csproj
index e3d85892b..81d3bd0b7 100644
--- a/Source/Test/Test.csproj
+++ b/Source/Test/Test.csproj
@@ -29,7 +29,7 @@
-
+
diff --git a/Tests/Tests.Actors.BugFinding/Tests.Actors.BugFinding.csproj b/Tests/Tests.Actors.BugFinding/Tests.Actors.BugFinding.csproj
index 8fd894a88..a6e190601 100644
--- a/Tests/Tests.Actors.BugFinding/Tests.Actors.BugFinding.csproj
+++ b/Tests/Tests.Actors.BugFinding/Tests.Actors.BugFinding.csproj
@@ -20,7 +20,7 @@
-
+
diff --git a/Tests/Tests.Actors/Tests.Actors.csproj b/Tests/Tests.Actors/Tests.Actors.csproj
index 3006bb36e..be42d6694 100644
--- a/Tests/Tests.Actors/Tests.Actors.csproj
+++ b/Tests/Tests.Actors/Tests.Actors.csproj
@@ -16,7 +16,7 @@
-
+
diff --git a/Tests/Tests.BugFinding/Tests.BugFinding.csproj b/Tests/Tests.BugFinding/Tests.BugFinding.csproj
index f88589d81..8d39c6415 100644
--- a/Tests/Tests.BugFinding/Tests.BugFinding.csproj
+++ b/Tests/Tests.BugFinding/Tests.BugFinding.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/Tests/Tests.Rewriting/Tests.Rewriting.csproj b/Tests/Tests.Rewriting/Tests.Rewriting.csproj
index c8a4f346f..c4e452dfe 100644
--- a/Tests/Tests.Rewriting/Tests.Rewriting.csproj
+++ b/Tests/Tests.Rewriting/Tests.Rewriting.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/Tests/Tests.Runtime/Tests.Runtime.csproj b/Tests/Tests.Runtime/Tests.Runtime.csproj
index c1ded38ba..b3a7bedba 100644
--- a/Tests/Tests.Runtime/Tests.Runtime.csproj
+++ b/Tests/Tests.Runtime/Tests.Runtime.csproj
@@ -19,7 +19,7 @@
-
+
diff --git a/Tools/CLI/Coyote.CLI.csproj b/Tools/CLI/Coyote.CLI.csproj
index 3f57435dc..38da737bf 100644
--- a/Tools/CLI/Coyote.CLI.csproj
+++ b/Tools/CLI/Coyote.CLI.csproj
@@ -18,17 +18,19 @@
-
-
+
+
+
+
diff --git a/Tools/Coyote/Coyote.csproj b/Tools/Coyote/Coyote.csproj
index a2ea7e013..8c43ef371 100644
--- a/Tools/Coyote/Coyote.csproj
+++ b/Tools/Coyote/Coyote.csproj
@@ -21,21 +21,27 @@
all
-
- all
-
+
+ all
+
+
+ all
+
+
+ all
+
diff --git a/Tools/GenDoc/GenDoc.csproj b/Tools/GenDoc/GenDoc.csproj
index fbfe1dfa4..8cb0f04ee 100644
--- a/Tools/GenDoc/GenDoc.csproj
+++ b/Tools/GenDoc/GenDoc.csproj
@@ -14,9 +14,9 @@
-
+
-
+