Skip to content

Commit 930ccc7

Browse files
smitpateldougbuwtgodbe
authored
[release/2.1] Move off expiring machine pools (#26794)
* Move off expiring machine pools * !temporary! Let's see what's going on - capture a binary log on macOS * !temporary! Fixup binary log capture - give up on `KOREBUILD_ENABLE_BINARY_LOG` * !up to you! Update KoreBuild to May build * !realz! Don't reference _really_ old runtimes - note this will not fix problems building on macOS 11 * Update korebuild-lock.txt * [release/2.1] Stop building w/ VS2017 in CI (#27233) * [release/2.1] Stop building w/ VS2017 in CI - version of VisualStudio is out of support * Update azure-pipelines.yml Co-authored-by: Doug Bunting <[email protected]> Co-authored-by: William Godbe <[email protected]>
1 parent e2c62a7 commit 930ccc7

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

Directory.Build.targets

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<!-- Assign these values at the end of the project after TargetFramework has been assigned. TargetFramework is not assigned yet in Directory.Build.props. -->
4-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">$(MicrosoftNETCoreApp11PackageVersion)</RuntimeFrameworkVersion>
5-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
64
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
75
<NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
86
</PropertyGroup>

build/dependencies.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.2</MicrosoftCodeAnalysisCSharpPackageVersion>
3232
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.8.2</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
3333
<MicrosoftCSharpPackageVersion>4.5.0</MicrosoftCSharpPackageVersion>
34-
<MicrosoftNETCoreApp11PackageVersion>1.1.13</MicrosoftNETCoreApp11PackageVersion>
35-
<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
3634
<MicrosoftNETTestSdkPackageVersion>15.9.2</MicrosoftNETTestSdkPackageVersion>
3735
<NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
3836
<OracleManagedDataAccessPackageVersion>12.2.1100</OracleManagedDataAccessPackageVersion>

build/repo.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
109
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
1110

1211
<ExcludeFromTest Include="$(RepositoryRoot)samples\OracleProvider\test\OracleProvider.FunctionalTests\*.csproj" />

build/templates/default-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ jobs:
6969
${{ if ne(parameters.poolName, '') }}:
7070
name: ${{ parameters.poolName }}
7171
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'macOS')) }}:
72-
vmImage: macOS-10.14
72+
vmImage: macOS-11
7373
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Linux')) }}:
7474
vmImage: ubuntu-18.04
7575
${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
7676
${{ if eq(variables['System.TeamProject'], 'public') }}:
7777
name: NetCore1ESPool-Svc-Public
78-
demands: ImageOverride -equals Build.Server.Amd64.VS2017.Open
78+
demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
7979
${{ if ne(variables['System.TeamProject'], 'public') }}:
8080
name: NetCore1ESPool-Svc-Internal
81-
demands: ImageOverride -equals Build.Server.Amd64.VS2017
81+
demands: ImageOverride -equals Build.Server.Amd64.VS2019
8282
variables:
8383
AgentOsName: ${{ parameters.agentOs }}
8484
DOTNET_HOME: $(Agent.WorkFolder)/.dotnet

korebuild-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:2.1.7-build-20210413.1
2-
commithash:41a55f8d844c4be8c4afa5f70f72b80067f0d113
1+
version:2.1.7-build-20211124.1
2+
commithash:30c0c6bc906a375bd85927ae575ee992965397a8

0 commit comments

Comments
 (0)