diff options
| -rw-r--r-- | ILAsmVersion.txt | 2 | ||||
| -rw-r--r-- | dependencies.props | 2 | ||||
| -rw-r--r-- | dir.common.props | 9 | ||||
| -rw-r--r-- | eng/platform-matrix.yml | 1 |
4 files changed, 5 insertions, 9 deletions
diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt index 9d451b5b66..2a6e60c71e 100644 --- a/ILAsmVersion.txt +++ b/ILAsmVersion.txt @@ -1 +1 @@ -3.0.0-preview6.19280.1 +3.0.0-rc2.19462.5 diff --git a/dependencies.props b/dependencies.props index 774b169ac7..4874fbe3ad 100644 --- a/dependencies.props +++ b/dependencies.props @@ -22,7 +22,7 @@ <!-- Tests/infrastructure dependency versions. --> <PropertyGroup> - <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> + <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-rc2.19462.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> <XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion> <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion> <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion> diff --git a/dir.common.props b/dir.common.props index 0dbada32da..652f5ed611 100644 --- a/dir.common.props +++ b/dir.common.props @@ -65,13 +65,8 @@ <PropertyGroup> <!-- Central place to set the versions of all nuget packages produced in the repo --> - <PackageVersion Condition="'$(PackageVersion)' == ''">3.1.0</PackageVersion> - - <!-- Set the boolean below to true to generate packages with stabilized versions --> - <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion> - <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion> - - <PreReleaseLabel>alpha1</PreReleaseLabel> + <PackageVersion Condition="'$(PackageVersion)' == ''">3.1.1</PackageVersion> + <PreReleaseLabel>servicing</PreReleaseLabel> </PropertyGroup> <!-- Set up common target properties that we use to conditionally include sources --> diff --git a/eng/platform-matrix.yml b/eng/platform-matrix.yml index b0ef62ca2b..21f25882f5 100644 --- a/eng/platform-matrix.yml +++ b/eng/platform-matrix.yml @@ -87,6 +87,7 @@ jobs: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - (Alpine.38.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-09ca40b-20190508143246 - (Alpine.39.Amd64)ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-helix-09ca40b-20190508143246 + - (Alpine.310.Amd64)Ubuntu.1604.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.10-helix-3043688-20190918214010 ${{ insert }}: ${{ parameters.jobParameters }} # Linux musl arm64 |