Merge pull request #139 from microsoft/Nava_fixerrors

Updating ADAL version
microsoft · Jul 15, 2020 · 4f8d98f · 4f8d98f
2 parents f43f96a + 485a1a4
commit 4f8d98f
Show file tree

Hide file tree

Showing 73 changed files with 326 additions and 317 deletions.
diff --git a/cds/App.config b/cds/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
     <!--
@@ -24,18 +24,18 @@
   LoginPrompt=Auto"/>-->
   </connectionStrings>
   <system.diagnostics>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
     <sources>
       <source name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchName="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" switchType="System.Diagnostics.SourceSwitch">
         <listeners>
-          <add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
-          <add name="fileListener"/>
+          <add name="console" type="System.Diagnostics.ConsoleTraceListener" />
+          <add name="fileListener" />
         </listeners>
       </source>
       <source name="Microsoft.Xrm.Tooling.CrmConnectControl" switchName="Microsoft.Xrm.Tooling.CrmConnectControl" switchType="System.Diagnostics.SourceSwitch">
         <listeners>
-          <add name="console" type="System.Diagnostics.ConsoleTraceListener"/>
-          <add name="fileListener"/>
+          <add name="console" type="System.Diagnostics.ConsoleTraceListener" />
+          <add name="fileListener" />
         </listeners>
       </source>
       <!--ADALListener conflicts with using ADAL libraries directly without the Xrm.Tooling.Connector assemblies.
@@ -58,13 +58,13 @@
 								Warning:    includes Error, Warning levels
 								Error:      includes Error level
 				-->
-      <add name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" value="Error"/>
-      <add name="Microsoft.Xrm.Tooling.CrmConnectControl" value="Error"/>
-      <add name="Microsoft.IdentityModel.Clients.ActiveDirectory" value="Error"/>
+      <add name="Microsoft.Xrm.Tooling.Connector.CrmServiceClient" value="Error" />
+      <add name="Microsoft.Xrm.Tooling.CrmConnectControl" value="Error" />
+      <add name="Microsoft.IdentityModel.Clients.ActiveDirectory" value="Error" />
     </switches>
     <sharedListeners>
-      <add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector"/>
-      <add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" BaseFileName="PowerApps-Sample-Log" Location="LocalUserApplicationDirectory" MaxFileSize="52428800"/>
+      <add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" />
+      <add name="fileListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" BaseFileName="PowerApps-Sample-Log" Location="LocalUserApplicationDirectory" MaxFileSize="52428800" />
       <!--
       fileListener Log written to 
       \\{Computer Name}\Users\{UserName}\AppData\Roaming\PowerApps\{Sample Project Name}\1.0.0.0\PowerApps-Sample-Log-{YYYY}-{MM}-{DD}.log
@@ -83,37 +83,37 @@
     </sharedListeners>
   </system.diagnostics>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Xrm.Sdk" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
+        <assemblyIdentity name="Microsoft.Xrm.Sdk" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Xrm.Sdk.Workflow" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
+        <assemblyIdentity name="Microsoft.Xrm.Sdk.Workflow" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="Microsoft.Xrm.Tooling.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Crm.Sdk.Proxy" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
+        <assemblyIdentity name="Microsoft.Crm.Sdk.Proxy" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078"/>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078"/>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.29.0.1078" newVersion="2.29.0.1078" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/...mailAttachements/CRUDEmailAttachments.sln → ...EmailAttachments/CRUDEmailAttachments.sln b/...mailAttachements/CRUDEmailAttachments.sln → ...EmailAttachments/CRUDEmailAttachments.sln
diff --git a/...chements/CRUDEmailAttachements/App.config → ...tachments/CRUDEmailAttachments/App.config b/...chements/CRUDEmailAttachements/App.config → ...tachments/CRUDEmailAttachments/App.config
diff --git a/...lAttachements/CRUDEmailAttachments.csproj → ...ilAttachments/CRUDEmailAttachments.csproj b/...lAttachements/CRUDEmailAttachments.csproj → ...ilAttachments/CRUDEmailAttachments.csproj
diff --git a/...nts/Helper-Code/MyOrganizationSdkTypes.cs → ...nts/Helper-Code/MyOrganizationSdkTypes.cs b/...nts/Helper-Code/MyOrganizationSdkTypes.cs → ...nts/Helper-Code/MyOrganizationSdkTypes.cs
diff --git a/...ailAttachements/Helper-Code/OptionSets.cs → ...mailAttachments/Helper-Code/OptionSets.cs b/...ailAttachements/Helper-Code/OptionSets.cs → ...mailAttachments/Helper-Code/OptionSets.cs
diff --git a/...Attachements/Helper-Code/SampleHelpers.cs → ...lAttachments/Helper-Code/SampleHelpers.cs b/...Attachements/Helper-Code/SampleHelpers.cs → ...lAttachments/Helper-Code/SampleHelpers.cs
diff --git a/...hements/Helper-Code/SystemUserProvider.cs → ...chments/Helper-Code/SystemUserProvider.cs b/...hements/Helper-Code/SystemUserProvider.cs → ...chments/Helper-Code/SystemUserProvider.cs
diff --git a/...tachements/Login-UX/ExampleLoginForm.xaml → ...ttachments/Login-UX/ExampleLoginForm.xaml b/...tachements/Login-UX/ExampleLoginForm.xaml → ...ttachments/Login-UX/ExampleLoginForm.xaml
diff --git a/...hements/Login-UX/ExampleLoginForm.xaml.cs → ...chments/Login-UX/ExampleLoginForm.xaml.cs b/...hements/Login-UX/ExampleLoginForm.xaml.cs → ...chments/Login-UX/ExampleLoginForm.xaml.cs
diff --git a/...ilAttachements/Properties/AssemblyInfo.cs → ...ailAttachments/Properties/AssemblyInfo.cs b/...ilAttachements/Properties/AssemblyInfo.cs → ...ailAttachments/Properties/AssemblyInfo.cs
diff --git a/...nts/CRUDEmailAttachements/SampleMethod.cs → ...ents/CRUDEmailAttachments/SampleMethod.cs b/...nts/CRUDEmailAttachements/SampleMethod.cs → ...ents/CRUDEmailAttachments/SampleMethod.cs
diff --git a/...ts/CRUDEmailAttachements/SampleProgram.cs → ...nts/CRUDEmailAttachments/SampleProgram.cs b/...ts/CRUDEmailAttachements/SampleProgram.cs → ...nts/CRUDEmailAttachments/SampleProgram.cs
diff --git a/...nts/CRUDEmailAttachements/packages.config → ...ents/CRUDEmailAttachments/packages.config b/...nts/CRUDEmailAttachements/packages.config → ...ents/CRUDEmailAttachments/packages.config
diff --git a/...orgsvc/C#/CRUDEmailAttachements/README.md → cds/orgsvc/C#/CRUDEmailAttachments/README.md b/...orgsvc/C#/CRUDEmailAttachements/README.md → cds/orgsvc/C#/CRUDEmailAttachments/README.md
diff --git a/cds/orgsvc/C#/DumpEntityMetadata/DumpEntityMetadata/DumpEntityMetadata.csproj b/cds/orgsvc/C#/DumpEntityMetadata/DumpEntityMetadata/DumpEntityMetadata.csproj
@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>DumpEntityMetadata</RootNamespace>
     <AssemblyName>DumpEntityMetadata</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,11 +36,11 @@
     <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.5\lib\net452\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.29.0.1078, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.29.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.29.0.1078, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.29.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.0.2.5\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>

diff --git a/cds/orgsvc/C#/DumpEntityMetadata/DumpEntityMetadata/packages.config b/cds/orgsvc/C#/DumpEntityMetadata/DumpEntityMetadata/packages.config
@@ -5,6 +5,6 @@
   <package id="Microsoft.CrmSdk.Workflow" version="9.0.2.4" targetFramework="net461" />
   <package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="9.0.2.5" targetFramework="net461" />
   <package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="9.0.2.5" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.22.302111727" targetFramework="net461" />
+  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.29.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net461" />
 </packages>
diff --git a/cds/orgsvc/C#/EarlyBoundEntityOperations/EarlyBoundEntityOperations/App.config b/cds/orgsvc/C#/EarlyBoundEntityOperations/EarlyBoundEntityOperations/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <connectionStrings>
     <!--
@@ -84,7 +84,7 @@
     </sharedListeners>
   </system.diagnostics>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -118,4 +118,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/...#/EarlyBoundEntityOperations/EarlyBoundEntityOperations/EarlyBoundEntityOperations.csproj b/...#/EarlyBoundEntityOperations/EarlyBoundEntityOperations/EarlyBoundEntityOperations.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>EarlyBoundEntityOperations</RootNamespace>
     <AssemblyName>EarlyBoundEntityOperations</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
@@ -36,11 +36,11 @@
     <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.5\lib\net452\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.29.0.1078, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.29.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.29.0.1078, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.29.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.0.2.7\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>

diff --git a/cds/orgsvc/C#/EarlyBoundEntityOperations/EarlyBoundEntityOperations/packages.config b/cds/orgsvc/C#/EarlyBoundEntityOperations/EarlyBoundEntityOperations/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.CrmSdk.Workflow" version="9.0.2.4" targetFramework="net461" />
   <package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="9.0.2.7" targetFramework="net461" />
   <package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="9.0.2.7" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.22.302111727" targetFramework="net461" />
+  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.29.0" targetFramework="net472" />
   <package id="Microsoft.PowerApps.Sample.Helpers-CS" version="1.0.1" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net461" />
 </packages>
diff --git a/cds/orgsvc/C#/EmailTemplate/EmailTemplate/EmailTemplate.csproj b/cds/orgsvc/C#/EmailTemplate/EmailTemplate/EmailTemplate.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>EmailTemplate</RootNamespace>
     <AssemblyName>EmailTemplate</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
@@ -36,11 +36,11 @@
     <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.4\lib\net452\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.29.0.1078, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.29.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.29.0.1078, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.29.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.0.2.3\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>

diff --git a/cds/orgsvc/C#/EmailTemplate/EmailTemplate/packages.config b/cds/orgsvc/C#/EmailTemplate/EmailTemplate/packages.config
@@ -5,6 +5,6 @@
   <package id="Microsoft.CrmSdk.Workflow" version="9.0.2.3" targetFramework="net461" />
   <package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="9.0.2.3" targetFramework="net461" />
   <package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="9.0.2.3" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.22.302111727" targetFramework="net461" />
+  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.29.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net461" />
 </packages>
diff --git a/...gsvc/C#/EnableDuplicateDetection/EnableDuplicateDetection/EnableDuplicateDetection.csproj b/...gsvc/C#/EnableDuplicateDetection/EnableDuplicateDetection/EnableDuplicateDetection.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>EnableDuplicateDetection</RootNamespace>
     <AssemblyName>EnableDuplicateDetection</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
@@ -36,11 +36,11 @@
     <Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.5\lib\net452\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.29.0.1078, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.29.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.22.302111727\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms, Version=2.29.0.1078, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.29.0\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.CrmSdk.XrmTooling.CoreAssembly.9.0.2.5\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>

diff --git a/cds/orgsvc/C#/EnableDuplicateDetection/EnableDuplicateDetection/packages.config b/cds/orgsvc/C#/EnableDuplicateDetection/EnableDuplicateDetection/packages.config
@@ -5,6 +5,6 @@
   <package id="Microsoft.CrmSdk.Workflow" version="9.0.2.4" targetFramework="net461" />
   <package id="Microsoft.CrmSdk.XrmTooling.CoreAssembly" version="9.0.2.5" targetFramework="net461" />
   <package id="Microsoft.CrmSdk.XrmTooling.WpfControls" version="9.0.2.5" targetFramework="net461" />
-  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.22.302111727" targetFramework="net461" />
+  <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.29.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net461" />
 </packages>