Modify some logic to support update NewtonSoftJson to 13.0.3 (#21529)

* Remove 7.1 support * Remove 7.1 support
Azure · Apr 13, 2023 · 21f2279 · 21f2279
1 parent 5f1d614
commit 21f2279
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 65 deletions.
diff --git a/.azure-pipelines/live-test.yml b/.azure-pipelines/live-test.yml
@@ -23,10 +23,6 @@ parameters:
   displayName: PowerShell 7.0.x Version
   type: string
   default: 7.0.*
-- name: ps_7_1_x
-  displayName: PowerShell 7.1.x Version
-  type: string
-  default: 7.1.*
 - name: ps_7_2_x
   displayName: PowerShell 7.2.x Version
   type: string
@@ -88,14 +84,6 @@ jobs:
     psVersion: ${{ parameters.ps_7_0_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
-- template: util/live-test-steps.yml
-  parameters:
-    name: 'ps_7_1_x_win_2019'
-    vmImage: ${{ parameters.img_windows_2019 }}
-    osType: 'Windows'
-    psVersion: ${{ parameters.ps_7_1_x }}
-    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
-
 - template: util/live-test-steps.yml
   parameters:
     name: 'ps_7_2_x_win_2019'
@@ -120,14 +108,6 @@ jobs:
     psVersion: ${{ parameters.ps_7_0_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
-- template: util/live-test-steps.yml
-  parameters:
-    name: 'ps_7_1_x_win_2022'
-    vmImage: ${{ parameters.img_windows_2022 }}
-    osType: 'Windows'
-    psVersion: ${{ parameters.ps_7_1_x }}
-    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
-
 - template: util/live-test-steps.yml
   parameters:
     name: 'ps_7_2_x_win_2022'
@@ -152,14 +132,6 @@ jobs:
     psVersion: ${{ parameters.ps_7_0_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
-- template: util/live-test-steps.yml
-  parameters:
-    name: 'ps_7_1_x_linux'
-    vmImage: ${{ parameters.img_linux }}
-    osType: 'Linux'
-    psVersion: ${{ parameters.ps_7_1_x }}
-    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
-
 - template: util/live-test-steps.yml
   parameters:
     name: 'ps_7_2_x_linux'
@@ -184,14 +156,6 @@ jobs:
     psVersion: ${{ parameters.ps_7_0_x }}
     dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
 
-- template: util/live-test-steps.yml
-  parameters:
-    name: 'ps_7_1_x_macOS'
-    vmImage: ${{ parameters.img_macos }}
-    osType: 'MacOS'
-    psVersion: ${{ parameters.ps_7_1_x }}
-    dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
-
 - template: util/live-test-steps.yml
   parameters:
     name: 'ps_7_2_x_macOS'

diff --git a/.azure-pipelines/release-test.yml b/.azure-pipelines/release-test.yml
@@ -7,10 +7,6 @@ parameters:
   displayName: PowerShell 7.0.x Version
   type: string
   default: 7.0.*
-- name: ps7_1
-  displayName: PowerShell 7.1.x Version
-  type: string
-  default: 7.1.*
 - name: ps7_2
   displayName: PowerShell 7.2.x Version
   type: string
@@ -64,14 +60,6 @@ jobs:
     psVersion: ${{ parameters.ps7 }}
     netCoreVersion: ${{ parameters.netCoreVersion }}
 
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'Win_PS7_1_X_SmokeTest'
-    agentPoolName: ${{ variables.winAgentPoolName }}
-    agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
-    psVersion: ${{ parameters.ps7_1 }}
-    netCoreVersion: ${{ parameters.netCoreVersion }}
-
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'Win_PS7_2_X_SmokeTest'
@@ -112,14 +100,6 @@ jobs:
     psVersion: ${{ parameters.ps7 }}
     netCoreVersion: ${{ parameters.netCoreVersion }}
 
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'Linux_PS7_1_X_SmokeTest'
-    agentPoolName: ${{ variables.linuxAgentPoolName }}
-    agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
-    psVersion: ${{ parameters.ps7_1 }}
-    netCoreVersion: ${{ parameters.netCoreVersion }}
-
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'Linux_PS7_2_X_SmokeTest'
@@ -160,14 +140,6 @@ jobs:
     psVersion: ${{ parameters.ps7 }}
     netCoreVersion: ${{ parameters.netCoreVersion }}
 
-- template: util/smoke-test-steps.yml
-  parameters:
-    name: 'MacOS_PS7_1_X_SmokeTest'
-    agentPoolName: ${{ variables.macOsAgentPoolName }}
-    agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
-    psVersion: ${{ parameters.ps7_1 }}
-    netCoreVersion: ${{ parameters.netCoreVersion }}
-
 - template: util/smoke-test-steps.yml
   parameters:
     name: 'MacOS_PS7_2_X_SmokeTest'

diff --git a/src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs b/src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs
@@ -67,7 +67,7 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
                 CreateAssembly("netfx", "Azure.Core", "1.31.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "Microsoft.Identity.Client", "4.49.1.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "Microsoft.Identity.Client.Extensions.Msal", "2.23.0.0").WithWindowsPowerShell(),
-                CreateAssembly("netfx", "Newtonsoft.Json", "12.0.0.0").WithWindowsPowerShell(),
+                CreateAssembly("netfx", "Newtonsoft.Json", "13.0.0.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Diagnostics.DiagnosticSource", "4.0.4.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Numerics.Vectors", "4.1.4.0").WithWindowsPowerShell(),
                 CreateAssembly("netfx", "System.Reflection.DispatchProxy", "4.0.4.0").WithWindowsPowerShell(),