diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f312f9a9..5f3b0f95 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -37,12 +37,6 @@ jobs:
       version: 6.0.x
       installationPath: '$(Agent.ToolsDirectory)/dotnet'
 
-  - task: UseDotNet@2
-    displayName: 'Use dotnet sdk 3.1'
-    inputs:
-      version: 3.1.x
-      installationPath: '$(Agent.ToolsDirectory)/dotnet'
-
   - task: CodeQL3000Init@0
 
   - task: DotNetCoreCLI@2
@@ -63,11 +57,14 @@ jobs:
       failTaskOnFailedTests: true
 
   - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@3
-    displayName: 'ESRP sign Microsoft.PowerPlatform.Formulas.Tools.dll'
+    displayName: 'Sign assemblies'
     inputs:
       ConnectedServiceName: 'ESRPCodeSigningConnection'
-      FolderPath: '$(Build.SourcesDirectory)/bin/$(BuildConfiguration)/PAModel/'
-      Pattern: '*.dll'
+      FolderPath: '$(Build.SourcesDirectory)/bin/$(BuildConfiguration)/'
+      Pattern: |
+        **/Microsoft.PowerPlatform.PowerApps.Persistence.dll
+        **/Microsoft.PowerPlatform.Formulas.Tools.dll
+      UseMinimatch: true
       signConfigType: inlineSignParams
       inlineOperation: |
         [
diff --git a/targets/targets.csproj b/targets/targets.csproj
index b9a8f7cc..8c420143 100644
--- a/targets/targets.csproj
+++ b/targets/targets.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsLabBuild)' == 'true'">