Skip to content

Commit 21f2279

Browse files
authored
Modify some logic to support update NewtonSoftJson to 13.0.3 (#21529)
* Remove 7.1 support * Remove 7.1 support
1 parent 5f1d614 commit 21f2279

File tree

3 files changed

+1
-65
lines changed

3 files changed

+1
-65
lines changed

.azure-pipelines/live-test.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ parameters:
2323
displayName: PowerShell 7.0.x Version
2424
type: string
2525
default: 7.0.*
26-
- name: ps_7_1_x
27-
displayName: PowerShell 7.1.x Version
28-
type: string
29-
default: 7.1.*
3026
- name: ps_7_2_x
3127
displayName: PowerShell 7.2.x Version
3228
type: string
@@ -88,14 +84,6 @@ jobs:
8884
psVersion: ${{ parameters.ps_7_0_x }}
8985
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
9086

91-
- template: util/live-test-steps.yml
92-
parameters:
93-
name: 'ps_7_1_x_win_2019'
94-
vmImage: ${{ parameters.img_windows_2019 }}
95-
osType: 'Windows'
96-
psVersion: ${{ parameters.ps_7_1_x }}
97-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
98-
9987
- template: util/live-test-steps.yml
10088
parameters:
10189
name: 'ps_7_2_x_win_2019'
@@ -120,14 +108,6 @@ jobs:
120108
psVersion: ${{ parameters.ps_7_0_x }}
121109
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
122110

123-
- template: util/live-test-steps.yml
124-
parameters:
125-
name: 'ps_7_1_x_win_2022'
126-
vmImage: ${{ parameters.img_windows_2022 }}
127-
osType: 'Windows'
128-
psVersion: ${{ parameters.ps_7_1_x }}
129-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
130-
131111
- template: util/live-test-steps.yml
132112
parameters:
133113
name: 'ps_7_2_x_win_2022'
@@ -152,14 +132,6 @@ jobs:
152132
psVersion: ${{ parameters.ps_7_0_x }}
153133
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
154134

155-
- template: util/live-test-steps.yml
156-
parameters:
157-
name: 'ps_7_1_x_linux'
158-
vmImage: ${{ parameters.img_linux }}
159-
osType: 'Linux'
160-
psVersion: ${{ parameters.ps_7_1_x }}
161-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
162-
163135
- template: util/live-test-steps.yml
164136
parameters:
165137
name: 'ps_7_2_x_linux'
@@ -184,14 +156,6 @@ jobs:
184156
psVersion: ${{ parameters.ps_7_0_x }}
185157
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
186158

187-
- template: util/live-test-steps.yml
188-
parameters:
189-
name: 'ps_7_1_x_macOS'
190-
vmImage: ${{ parameters.img_macos }}
191-
osType: 'MacOS'
192-
psVersion: ${{ parameters.ps_7_1_x }}
193-
dotnetVersion: ${{ parameters.dotnet_sdk_6 }}
194-
195159
- template: util/live-test-steps.yml
196160
parameters:
197161
name: 'ps_7_2_x_macOS'

.azure-pipelines/release-test.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ parameters:
77
displayName: PowerShell 7.0.x Version
88
type: string
99
default: 7.0.*
10-
- name: ps7_1
11-
displayName: PowerShell 7.1.x Version
12-
type: string
13-
default: 7.1.*
1410
- name: ps7_2
1511
displayName: PowerShell 7.2.x Version
1612
type: string
@@ -64,14 +60,6 @@ jobs:
6460
psVersion: ${{ parameters.ps7 }}
6561
netCoreVersion: ${{ parameters.netCoreVersion }}
6662

67-
- template: util/smoke-test-steps.yml
68-
parameters:
69-
name: 'Win_PS7_1_X_SmokeTest'
70-
agentPoolName: ${{ variables.winAgentPoolName }}
71-
agentPoolVMImage: ${{ variables.winAgentPoolVMImage }}
72-
psVersion: ${{ parameters.ps7_1 }}
73-
netCoreVersion: ${{ parameters.netCoreVersion }}
74-
7563
- template: util/smoke-test-steps.yml
7664
parameters:
7765
name: 'Win_PS7_2_X_SmokeTest'
@@ -112,14 +100,6 @@ jobs:
112100
psVersion: ${{ parameters.ps7 }}
113101
netCoreVersion: ${{ parameters.netCoreVersion }}
114102

115-
- template: util/smoke-test-steps.yml
116-
parameters:
117-
name: 'Linux_PS7_1_X_SmokeTest'
118-
agentPoolName: ${{ variables.linuxAgentPoolName }}
119-
agentPoolVMImage: ${{ variables.linuxAgentPoolVMImage }}
120-
psVersion: ${{ parameters.ps7_1 }}
121-
netCoreVersion: ${{ parameters.netCoreVersion }}
122-
123103
- template: util/smoke-test-steps.yml
124104
parameters:
125105
name: 'Linux_PS7_2_X_SmokeTest'
@@ -160,14 +140,6 @@ jobs:
160140
psVersion: ${{ parameters.ps7 }}
161141
netCoreVersion: ${{ parameters.netCoreVersion }}
162142

163-
- template: util/smoke-test-steps.yml
164-
parameters:
165-
name: 'MacOS_PS7_1_X_SmokeTest'
166-
agentPoolName: ${{ variables.macOsAgentPoolName }}
167-
agentPoolVMImage: ${{ variables.macOsAgentPoolVMImage }}
168-
psVersion: ${{ parameters.ps7_1 }}
169-
netCoreVersion: ${{ parameters.netCoreVersion }}
170-
171143
- template: util/smoke-test-steps.yml
172144
parameters:
173145
name: 'MacOS_PS7_2_X_SmokeTest'

src/Accounts/AssemblyLoading/ConditionalAssemblyProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static void Initialize(string rootPath, IConditionalAssemblyContext conte
6767
CreateAssembly("netfx", "Azure.Core", "1.31.0.0").WithWindowsPowerShell(),
6868
CreateAssembly("netfx", "Microsoft.Identity.Client", "4.49.1.0").WithWindowsPowerShell(),
6969
CreateAssembly("netfx", "Microsoft.Identity.Client.Extensions.Msal", "2.23.0.0").WithWindowsPowerShell(),
70-
CreateAssembly("netfx", "Newtonsoft.Json", "12.0.0.0").WithWindowsPowerShell(),
70+
CreateAssembly("netfx", "Newtonsoft.Json", "13.0.0.0").WithWindowsPowerShell(),
7171
CreateAssembly("netfx", "System.Diagnostics.DiagnosticSource", "4.0.4.0").WithWindowsPowerShell(),
7272
CreateAssembly("netfx", "System.Numerics.Vectors", "4.1.4.0").WithWindowsPowerShell(),
7373
CreateAssembly("netfx", "System.Reflection.DispatchProxy", "4.0.4.0").WithWindowsPowerShell(),

0 commit comments

Comments
 (0)