Skip to content

Commit 29b28b9

Browse files
authored
Upgrade PowerShell to 7.0.6 (#15113)
Upgrade Linux Image of CI pipeline to Ubuntu 20.04 Co-authored-by: wyunchi-ms <[email protected]>
1 parent f05fde1 commit 29b28b9

File tree

12 files changed

+17
-17
lines changed

12 files changed

+17
-17
lines changed

.azure-pipelines/powershell-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ variables:
22
WindowsName: windows
33
WindowsImage: vs2017-win2016
44
LinuxName: linux
5-
LinuxImage: ubuntu-18.04
5+
LinuxImage: ubuntu-20.04
66
MacOSName: macOS
77
MacOSImage: macOS-10.14
88
TestFramework: netcoreapp2.1

.azure-pipelines/util/analyze-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
displayName: 'Use .NET Core sdk'
1212
inputs:
1313
packageType: sdk
14-
version: 2.1.x
14+
version: 3.1.x
1515

1616
- pwsh: 'Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser'
1717
displayName: 'Install platyPS'

.azure-pipelines/util/build-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
displayName: 'Use .NET Core sdk'
1414
inputs:
1515
packageType: sdk
16-
version: 2.1.x
16+
version: 3.1.x
1717

1818
- task: DotNetCoreCLI@2
1919
displayName: Build

build.proj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@
103103
</Target>
104104

105105
<Target Name="BuildTools">
106-
<Exec Command="dotnet publish $(RepoTools)StaticAnalysis/StaticAnalysis.Netcore.csproj -c $(Configuration) -f netcoreapp2.1" />
106+
<Exec Command="dotnet publish $(RepoTools)StaticAnalysis/StaticAnalysis.Netcore.csproj -c $(Configuration)" />
107107
</Target>
108108

109109
<Target Name="FilterBuild" Condition="$(PullRequestNumber) != '' OR $(TargetModule) != ''" DependsOnTargets="BuildTools">
110110
<Message Importance="high" Text="Filtering projects and modules..." />
111111
<Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/CreateFilterMappings.ps1&quot;" />
112112

113113
<!-- Build the Microsoft.Azure.Build.Tasks project -->
114-
<Exec Command="dotnet publish $(RepoTools)BuildPackagesTask/Microsoft.Azure.Build.Tasks/Microsoft.Azure.Build.Tasks.csproj -c $(Configuration) -f netstandard2.0" />
114+
<Exec Command="dotnet publish $(RepoTools)BuildPackagesTask/Microsoft.Azure.Build.Tasks/Microsoft.Azure.Build.Tasks.csproj -c $(Configuration)" />
115115

116116
<!-- Get all of the files changed in the given pull request -->
117117
<FilesChangedTask RepositoryOwner="Azure" RepositoryName="azure-powershell" PullRequestNumber="$(PullRequestNumber)" TargetModule="$(TargetModule)">
@@ -268,11 +268,11 @@
268268
</Target>
269269

270270
<Target Name="AzToolsInstaller">
271-
<Exec Command="dotnet msbuild $(RepoTools)/Az.Tools.Installer/build.proj /t:'clean;build;test'" />
271+
<Exec Command='dotnet msbuild $(RepoTools)/Az.Tools.Installer/build.proj /t:"clean;build;test"' />
272272
</Target>
273273

274274
<Target Name="AzToolsPredictor">
275-
<Exec Command="dotnet msbuild $(RepoTools)/Az.Tools.Predictor/build.proj /t:'clean;build;test'" />
275+
<Exec Command='dotnet msbuild $(RepoTools)/Az.Tools.Predictor/build.proj /t:"clean;build;test"' />
276276
</Target>
277277

278278
<Target Name="ChangeLogErrorMessage">

src/Automation/Automation.Test/Automation.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PropertyGroup>
1010
<RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
1111
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
12-
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
12+
<TargetFramework>netcoreapp2.1</TargetFramework>
1313
</PropertyGroup>
1414

1515
<ItemGroup>

src/Az.Test.props

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

1212
<!-- Build -->
1313
<PropertyGroup>
14-
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
14+
<TargetFramework>netcoreapp2.1</TargetFramework>
1515
<AssemblyName>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</AssemblyName>
1616
<RootNamespace>$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
1717
<IsPackable>false</IsPackable>

src/Storage/Storage.Test/Storage.Test.csproj

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

1010
<PropertyGroup>
1111
<RootNamespace>Microsoft.WindowsAzure.Management.$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace>
12-
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
12+
<TargetFramework>netcoreapp2.1</TargetFramework>
1313
</PropertyGroup>
1414

1515
<ItemGroup>

tools/BuildPackagesTask/Microsoft.Azure.Build.Tasks/Microsoft.Azure.Build.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Repo.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>netstandard2.0</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<AssemblyName>Microsoft.Azure.Build.Tasks</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Build.Tasks</RootNamespace>
99
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

tools/StaticAnalysis/StaticAnalysis.Netcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>netcoreapp2.1</TargetFramework>
7+
<TargetFramework>netcoreapp3.1</TargetFramework>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -23,7 +23,7 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
26-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" />
26+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.6" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

tools/Tools.Common.Test/Tools.Common.Test.csproj

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

55
<PropertyGroup>
6-
<TargetFramework>netcoreapp2.2</TargetFramework>
6+
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

tools/Tools.Common/Tools.Common.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<AssemblyName>Tools.Common</AssemblyName>
66
<RootNamespace>Tools.Common</RootNamespace>
77
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

tools/VersionController/VersionController.Netcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>netcoreapp2.1</TargetFramework>
7+
<TargetFramework>netcoreapp3.1</TargetFramework>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
99
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.5" />
2727
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.5" />
2828
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
29-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" />
29+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.6" />
3030
</ItemGroup>
3131

3232
<ItemGroup>

0 commit comments

Comments
 (0)