Remove System.ServiceModel.Primitives.dll (Azure#16882)

* Remove System.Private.ServiceModel.dll * add more * Add changelog
azure-sdk · Jan 21, 2022 · 9ed13e7 · 9ed13e7
1 parent 0fc3761
commit 9ed13e7
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 3 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <clear/>
+    <clear />
     <!-- Do not add any additional feeds if new packages are needed they need to come from nuget.org or our azure-sdk-for-net DevOps feed -->
     <add key="local-feed" value="tools/LocalFeed" />
     <add key="azure-powershell" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-powershell/nuget/v3/index.json" />

diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md
@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Removed legacy assembly System.Private.ServiceModel and System.ServiceModel.Primitives [#16063]
 
 ## Version 2.7.1
 * Copied `ServicePrincipalSecret` and `CertificatePassword` from Az.Accounts buildin profile to customer set profile. [#16617]

diff --git a/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs b/src/Accounts/Authentication/Utilities/CustomAssemblyResolver.cs
@@ -37,14 +37,12 @@ public static class CustomAssemblyResolver
                 {"System.Memory.Data", new Version("1.0.2.0")},
                 {"System.Net.Http.WinHttpHandler", new Version("4.0.2.0")},
                 {"System.Numerics.Vectors", new Version("4.1.3.0")},
-                {"System.Private.ServiceModel", new Version("4.1.2.1")},
                 {"System.Reflection.DispatchProxy", new Version("4.0.3.0")},
                 {"System.Runtime.CompilerServices.Unsafe", new Version("4.0.5.0")},
                 {"System.Security.AccessControl", new Version("4.1.1.0")},
                 {"System.Security.Cryptography.Cng", new Version("4.3.0.0")},
                 {"System.Security.Permissions", new Version("4.0.1.0")},
                 {"System.Security.Principal.Windows", new Version("4.1.1.0")},
-                {"System.ServiceModel.Primitives", new Version("4.2.0.0")},
                 {"System.Text.Encodings.Web", new Version("4.0.5.1")},
                 {"System.Text.Json", new Version("4.0.0.0")},
                 {"System.Threading.Tasks.Extensions", new Version("4.2.0.1")},

diff --git a/src/lib/NetFxPreloadAssemblies/System.Private.ServiceModel.dll b/src/lib/NetFxPreloadAssemblies/System.Private.ServiceModel.dll
diff --git a/src/lib/NetFxPreloadAssemblies/System.ServiceModel.Primitives.dll b/src/lib/NetFxPreloadAssemblies/System.ServiceModel.Primitives.dll