diff --git a/ApiVersioning.sln b/ApiVersioning.sln
index 3dae7fca..e128fc08 100644
--- a/ApiVersioning.sln
+++ b/ApiVersioning.sln
@@ -24,7 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{2957BAF3-9
 		.gitignore = .gitignore
 		azure-pipelines.yml = azure-pipelines.yml
 		CONTRIBUTING.md = CONTRIBUTING.md
-		LICENSE = LICENSE
+		LICENSE.txt = LICENSE.txt
 		nuget.config = nuget.config
 		README.md = README.md
 		SECURITY.md = SECURITY.md
@@ -113,7 +113,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.ApiExplorer", "src\C
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2BB57808-14AF-4209-9842-1D6E76A99C3F}"
 	ProjectSection(SolutionItems) = preProject
-		after.apiversioning.sln.targets = after.apiversioning.sln.targets
 		build\code-analysis.props = build\code-analysis.props
 		build\common.props = build\common.props
 		build\file-version.targets = build\file-version.targets
@@ -122,8 +121,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2BB57808
 		build\nuget.props = build\nuget.props
 		build\nuget.targets = build\nuget.targets
 		build\resource.targets = build\resource.targets
+		build\signing.json = build\signing.json
 		build\signing.props = build\signing.props
-		build\signing.targets = build\signing.targets
 		build\steps-ci.yml = build\steps-ci.yml
 		build\steps-release.yml = build\steps-release.yml
 		build\stylecop.json = build\stylecop.json
diff --git a/after.apiversioning.sln.targets b/after.apiversioning.sln.targets
deleted file mode 100644
index 4098d8d9..00000000
--- a/after.apiversioning.sln.targets
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
- <Import Project="$(MSBuildThisFileDirectory)\build\signing.targets" />
-
- <Target Name="AfterSolutionBuild" AfterTargets="Build">
-
-  <PropertyGroup>
-   <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-   <BuildProperties>Configuration=$(Configuration)</BuildProperties>
-   <BuildProperties Condition=" ('$(Platform)' != '') AND ('$(Platform)' != 'AnyCPU') AND ('$(Platform)' != 'Any CPU') ">$(BuildProperties);Platform=$(Platform)</BuildProperties>
-  </PropertyGroup>
-
-  <ItemGroup>
-   <Projects Include="$(MSBuildThisFileDirectory)\src\**\*.csproj" />
-  </ItemGroup>
-
-  <MSBuild Projects="@(Projects)" Targets="GetTargetPaths" Properties="$(BuildProperties)" UnloadProjectsOnCompletion="true">
-   <Output TaskParameter="TargetOutputs" ItemName="TargetFiles" />
-  </MSBuild>
-
-  <PropertyGroup>
-   <!-- transform list to pipe-separated values so we can forward it as a parameter using a build property -->
-   <SigningProperties>
-    SourceDir=$(MSBuildThisFileDirectory)\src;
-    FilesToSign=@(TargetFiles->'%(Identity)','|')
-   </SigningProperties>
-  </PropertyGroup>
-
-  <MSBuild Projects ="$(MSBuildThisFileFullPath)" Targets="WriteCodeSigningFileList" Properties="$(SigningProperties)" />
-
- </Target>
-
-</Project>
\ No newline at end of file
diff --git a/build/signing.json b/build/signing.json
new file mode 100644
index 00000000..3276a45d
--- /dev/null
+++ b/build/signing.json
@@ -0,0 +1,13 @@
+{
+  "SignClient": {
+    "AzureAd": {
+      "AADInstance": "https://login.microsoftonline.com/",
+      "ClientId": "c248d68a-ba6f-4aa9-8a68-71fe872063f8",
+      "TenantId": "16076fdc-fcc1-4a15-b1ca-32c9a255900e"
+    },
+    "Service": {
+      "Url": "https://codesign.dotnetfoundation.org/",
+      "ResourceId": "https://SignService/3c30251f-36f3-490b-a955-520addb85001"
+    }
+  }
+}
\ No newline at end of file
diff --git a/build/signing.targets b/build/signing.targets
deleted file mode 100644
index bdd30fb6..00000000
--- a/build/signing.targets
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- REF: https://microsoft.sharepoint.com/teams/prss/esrp/info/ESRP%20Onboarding%20Wiki/Integrate%20the%20ESRP%20CodeSign%20Task%20into%20VSO.aspx -->
-  <PropertyGroup>
-    <SignConfigPath Condition=" '$(SignConfigPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\bin'))</SignConfigPath>
-  </PropertyGroup>
-
-  <Target Name="WriteCodeSigningFileList">
-
-    <ItemGroup>
-      <FilesToSign Include="$(FilesToSign.Split('|'))" />
-    </ItemGroup>
-
-    <MakeDir Directories="$(SignConfigPath)" Condition="!Exists('$(SignConfigPath)')" />
-    <WriteLinesToFile File="$(SignConfigPath)\signing-file-list.txt" Encoding="ascii" Lines="@(FilesToSign->'%(Identity)'->Substring($(SourceDir.Length)),',')" Overwrite="true" />
-
-  </Target>
-
-</Project>
\ No newline at end of file