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:
2
2
WindowsName : windows
3
3
WindowsImage : vs2017-win2016
4
4
LinuxName : linux
5
- LinuxImage : ubuntu-18 .04
5
+ LinuxImage : ubuntu-20 .04
6
6
MacOSName : macOS
7
7
MacOSImage : macOS-10.14
8
8
TestFramework : netcoreapp2.1
Original file line number Diff line number Diff line change 11
11
displayName : ' Use .NET Core sdk'
12
12
inputs :
13
13
packageType : sdk
14
- version : 2 .1.x
14
+ version : 3 .1.x
15
15
16
16
- pwsh : ' Install-Module platyPS -Force -Confirm:$false -Scope CurrentUser'
17
17
displayName : ' Install platyPS'
Original file line number Diff line number Diff line change 13
13
displayName : ' Use .NET Core sdk'
14
14
inputs :
15
15
packageType : sdk
16
- version : 2 .1.x
16
+ version : 3 .1.x
17
17
18
18
- task : DotNetCoreCLI@2
19
19
displayName : Build
Original file line number Diff line number Diff line change 103
103
</Target >
104
104
105
105
<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)" />
107
107
</Target >
108
108
109
109
<Target Name =" FilterBuild" Condition =" $(PullRequestNumber) != '' OR $(TargetModule) != ''" DependsOnTargets =" BuildTools" >
110
110
<Message Importance =" high" Text =" Filtering projects and modules..." />
111
111
<Exec Command =" $(PowerShellCoreCommandPrefix) " . $(RepoTools)/CreateFilterMappings.ps1" " />
112
112
113
113
<!-- 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)" />
115
115
116
116
<!-- Get all of the files changed in the given pull request -->
117
117
<FilesChangedTask RepositoryOwner =" Azure" RepositoryName =" azure-powershell" PullRequestNumber =" $(PullRequestNumber)" TargetModule =" $(TargetModule)" >
268
268
</Target >
269
269
270
270
<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" ' />
272
272
</Target >
273
273
274
274
<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" ' />
276
276
</Target >
277
277
278
278
<Target Name =" ChangeLogErrorMessage" >
Original file line number Diff line number Diff line change 9
9
<PropertyGroup >
10
10
<RootNamespace >$(LegacyAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace >
11
11
<AutoGenerateBindingRedirects >false</AutoGenerateBindingRedirects >
12
- <TargetFrameworks >netcoreapp2.1</TargetFrameworks >
12
+ <TargetFramework >netcoreapp2.1</TargetFramework >
13
13
</PropertyGroup >
14
14
15
15
<ItemGroup >
Original file line number Diff line number Diff line change 11
11
12
12
<!-- Build -->
13
13
<PropertyGroup >
14
- <TargetFrameworks >netcoreapp2.1</TargetFrameworks >
14
+ <TargetFramework >netcoreapp2.1</TargetFramework >
15
15
<AssemblyName >$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</AssemblyName >
16
16
<RootNamespace >$(AzAssemblyPrefix)$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace >
17
17
<IsPackable >false</IsPackable >
Original file line number Diff line number Diff line change 9
9
10
10
<PropertyGroup >
11
11
<RootNamespace >Microsoft.WindowsAzure.Management.$(PsModuleName)$(AzTestAssemblySuffix)</RootNamespace >
12
- <TargetFrameworks >netcoreapp2.1</TargetFrameworks >
12
+ <TargetFramework >netcoreapp2.1</TargetFramework >
13
13
</PropertyGroup >
14
14
15
15
<ItemGroup >
Original file line number Diff line number Diff line change 3
3
<Import Project =" $(MSBuildThisFileDirectory)..\..\..\Repo.props" />
4
4
5
5
<PropertyGroup >
6
- <TargetFramework >netstandard2.0 </TargetFramework >
6
+ <TargetFramework >netcoreapp3.1 </TargetFramework >
7
7
<AssemblyName >Microsoft.Azure.Build.Tasks</AssemblyName >
8
8
<RootNamespace >Microsoft.Azure.Build.Tasks</RootNamespace >
9
9
<GenerateAssemblyInfo >false</GenerateAssemblyInfo >
Original file line number Diff line number Diff line change 4
4
5
5
<PropertyGroup >
6
6
<OutputType >Exe</OutputType >
7
- <TargetFramework >netcoreapp2 .1</TargetFramework >
7
+ <TargetFramework >netcoreapp3 .1</TargetFramework >
8
8
<GenerateAssemblyInfo >false</GenerateAssemblyInfo >
9
9
<AppendTargetFrameworkToOutputPath >false</AppendTargetFrameworkToOutputPath >
10
10
<TreatWarningsAsErrors >true</TreatWarningsAsErrors >
23
23
24
24
<ItemGroup >
25
25
<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 " />
27
27
</ItemGroup >
28
28
29
29
<ItemGroup >
Original file line number Diff line number Diff line change 3
3
<Import Project =" $(MSBuildThisFileDirectory)..\Common.Netcore.Dependencies.Test.targets" />
4
4
5
5
<PropertyGroup >
6
- <TargetFramework >netcoreapp2.2 </TargetFramework >
6
+ <TargetFramework >netcoreapp3.1 </TargetFramework >
7
7
<IsPackable >false</IsPackable >
8
8
</PropertyGroup >
9
9
Original file line number Diff line number Diff line change 1
1
<Project Sdk =" Microsoft.NET.Sdk" >
2
2
3
3
<PropertyGroup >
4
- <TargetFramework >netstandard2.0 </TargetFramework >
4
+ <TargetFramework >netcoreapp3.1 </TargetFramework >
5
5
<AssemblyName >Tools.Common</AssemblyName >
6
6
<RootNamespace >Tools.Common</RootNamespace >
7
7
<GenerateAssemblyInfo >false</GenerateAssemblyInfo >
Original file line number Diff line number Diff line change 4
4
5
5
<PropertyGroup >
6
6
<OutputType >Exe</OutputType >
7
- <TargetFramework >netcoreapp2 .1</TargetFramework >
7
+ <TargetFramework >netcoreapp3 .1</TargetFramework >
8
8
<GenerateAssemblyInfo >false</GenerateAssemblyInfo >
9
9
<AppendTargetFrameworkToOutputPath >false</AppendTargetFrameworkToOutputPath >
10
10
<TreatWarningsAsErrors >true</TreatWarningsAsErrors >
26
26
<PackageReference Include =" Microsoft.Extensions.Logging.Console" Version =" 3.1.5" />
27
27
<PackageReference Include =" Microsoft.Extensions.Logging.Debug" Version =" 3.1.5" />
28
28
<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 " />
30
30
</ItemGroup >
31
31
32
32
<ItemGroup >
You can’t perform that action at this time.
0 commit comments