Skip to content

Commit 723943b

Browse files
authored
Upgrade target framework to netcoreapp3.1 (#19551)
1 parent cc5a456 commit 723943b

File tree

8 files changed

+38
-27
lines changed

8 files changed

+38
-27
lines changed

.azure-pipelines/release-test.yml

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ parameters:
1515
displayName: Windows PowerShell Version
1616
type: string
1717
default: 5.1.14
18-
- name: ps6
19-
displayName: PowerShell 6 Version
20-
type: string
21-
default: 6.2.4
2218
- name: ps7
23-
displayName: PowerShell 7 Version
19+
displayName: PowerShell 7.0.x Version
2420
type: string
25-
default: 7.0.3
21+
default: 7.0.8
22+
- name: ps7_1
23+
displayName: PowerShell 7.1.x Version
24+
type: string
25+
default: 7.1.5
26+
- name: ps7_2
27+
displayName: PowerShell 7.2.x Version
28+
type: string
29+
default: 7.2.0
2630
- name: latest_ps
2731
displayName: PowerShell Latest Version
2832
type: string
@@ -40,15 +44,21 @@ jobs:
4044

4145
- template: util/smoke-test-steps.yml
4246
parameters:
43-
name: 'Win_PS6_2_4_SmokeTest'
47+
name: 'Win_PS7_0_X_SmokeTest'
4448
vmImage: ${{ parameters.win_image }}
45-
psVersion: ${{ parameters.ps6 }}
49+
psVersion: ${{ parameters.ps7 }}
4650

4751
- template: util/smoke-test-steps.yml
4852
parameters:
49-
name: 'Win_PS7_0_3_SmokeTest'
53+
name: 'Win_PS7_1_X_SmokeTest'
5054
vmImage: ${{ parameters.win_image }}
51-
psVersion: ${{ parameters.ps7 }}
55+
psVersion: ${{ parameters.ps7_1 }}
56+
57+
- template: util/smoke-test-steps.yml
58+
parameters:
59+
name: 'Win_PS7_2_X_SmokeTest'
60+
vmImage: ${{ parameters.win_image }}
61+
psVersion: ${{ parameters.ps7_2 }}
5262

5363
- template: util/smoke-test-steps.yml
5464
parameters:
@@ -58,33 +68,33 @@ jobs:
5868

5969
- template: util/smoke-test-steps.yml
6070
parameters:
61-
name: 'Linux_PS6_2_4_SmokeTest'
71+
name: 'Linux_PS7_0_X_SmokeTest'
6272
vmImage: ${{ parameters.linux_image }}
63-
psVersion: ${{ parameters.ps6 }}
73+
psVersion: ${{ parameters.ps7 }}
6474

6575
- template: util/smoke-test-steps.yml
6676
parameters:
67-
name: 'Linux_PS7_0_3_SmokeTest'
77+
name: 'Linux_PS7_1_X_SmokeTest'
6878
vmImage: ${{ parameters.linux_image }}
69-
psVersion: ${{ parameters.ps7 }}
79+
psVersion: ${{ parameters.ps7_1 }}
7080

7181
- template: util/smoke-test-steps.yml
7282
parameters:
73-
name: 'Linux_Latest_PS_SmokeTest'
83+
name: 'Linux_PS7_2_X_SmokeTest'
7484
vmImage: ${{ parameters.linux_image }}
75-
psVersion: ${{ parameters.latest_ps }}
85+
psVersion: ${{ parameters.ps7_2 }}
7686

7787
- template: util/smoke-test-steps.yml
7888
parameters:
79-
name: 'MacOS_PS6_2_4_SmokeTest'
80-
vmImage: ${{ parameters.macOS_image }}
81-
psVersion: ${{ parameters.ps6 }}
89+
name: 'Linux_Latest_PS_SmokeTest'
90+
vmImage: ${{ parameters.linux_image }}
91+
psVersion: ${{ parameters.latest_ps }}
8292

8393
- template: util/smoke-test-steps.yml
8494
parameters:
85-
name: 'MacOS_PS7_0_3_SmokeTest'
95+
name: 'MacOS_PS7_2_X_SmokeTest'
8696
vmImage: ${{ parameters.macOS_image }}
87-
psVersion: ${{ parameters.ps7 }}
97+
psVersion: ${{ parameters.ps7_2 }}
8898

8999
- template: util/smoke-test-steps.yml
90100
parameters:

documentation/development-docs/azure-powershell-developer-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The following prerequisites should be completed before contributing to the Azure
4747
- Install [Visual Studio 2019 or above](https://www.visualstudio.com/downloads/)
4848
- Install the latest version of [Git](https://git-scm.com/downloads)
4949
- Install the [`platyPS` module](help-generation.md#Installing-platyPS)
50-
- Install the latest [**.NET Core SDK** and **.NET Framework Dev Pack 4.7.2**](https://dotnet.microsoft.com/download) or greater
50+
- Install [**.NET Core 3.1, the Latest .NET, and .NET Framework Dev Pack 4.7.2**](https://dotnet.microsoft.com/en-us/download/dotnet) or greater
5151
- Install [PowerShell 7](https://github.com/PowerShell/PowerShell/releases/latest)
5252
- Set the PowerShell [execution policy](https://technet.microsoft.com/en-us/library/ee176961.aspx) to **Unrestricted** for the following versions of PowerShell:
5353
- `C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe`

src/Accounts/Accounts/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
## Upcoming Release
2222
* Supported tenant domain as input while using `Connect-AzAccount` with parameter `Tenant`. [#19471]
23+
* Changed target framework of AuthenticationAssemblyLoadContext to netcoreapp3.1.
2324

2425
## Version 2.10.1
2526
* Deduplicated subscriptions belonging to multiple tenants while using `Get-AzSubscription` with parameter `SubscriptionName`. [#19427]

src/Accounts/AuthenticationAssemblyLoadContext/AuthenticationAssemblyLoadContext.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Import Project="$(MSBuildThisFileDirectory)..\..\Az.props" />
77

88
<PropertyGroup>
9-
<TargetFramework>netcoreapp2.1</TargetFramework>
9+
<TargetFramework>netcoreapp3.1</TargetFramework>
1010
<AssemblyName>Microsoft.Azure.PowerShell.AuthenticationAssemblyLoadContext</AssemblyName>
1111
<RootNamespace>Microsoft.Azure.PowerShell.AuthenticationAssemblyLoadContext</RootNamespace>
1212
</PropertyGroup>

tools/FormatPs1XmlGenerator/FormatPs1XmlGenerator.Test/FormatPs1XmlGenerator.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$(MSBuildThisFileDirectory)..\..\Common.Netcore.Dependencies.Test.targets" />
33

44
<PropertyGroup>
5-
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

tools/NetCoreCsProjSync/NetCoreCsProjSync/NetCoreBase.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
6+
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
77
<AssemblyName></AssemblyName>
88
<RootNamespace></RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

tools/NetCoreCsProjSync/NetCoreCsProjSync/NetCoreCsProjSync.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

tools/NetCorePsd1Sync/NetCorePsd1Sync/NetCorePsd1Sync.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net472</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
66
</PropertyGroup>
77

88
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

0 commit comments

Comments
 (0)