File tree Expand file tree Collapse file tree 12 files changed +17
-17
lines changed
Automation/Automation.Test
BuildPackagesTask/Microsoft.Azure.Build.Tasks Expand file tree Collapse file tree 12 files changed +17
-17
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 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'
Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change 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) " . $(RepoTools)/CreateFilterMappings.ps1" " />
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)" >
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" >
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 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 >
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 >
Original file line number Diff line number Diff line change 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
You can’t perform that action at this time.
0 commit comments