diff options
author | Nate McMaster <natemcmaster@users.noreply.github.com> | 2017-12-01 02:03:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-01 02:03:51 +0300 |
commit | 1db6eb082336f1ce4b656b988bbb1c299fb3b378 (patch) | |
tree | c8ec0cd22f602fefbe414d9a019fa8a77f9c92f9 | |
parent | 740b81e989a26cbfeadbeac9ea182d79e70b6b91 (diff) |
Add support for automatically installing new versions of the 2.1 runtime (#676)
-rw-r--r-- | build/dependencies.props | 9 | ||||
-rw-r--r-- | build/repo.props | 4 | ||||
-rw-r--r-- | run.ps1 | 13 |
3 files changed, 22 insertions, 4 deletions
diff --git a/build/dependencies.props b/build/dependencies.props index 8752bca426..f575dfbe83 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,5 +1,7 @@ <Project> + <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" /> + <ItemDefinitionGroup> <ExternalDependency> <!-- The NuGet package version. Floating versions not allowed. --> @@ -29,13 +31,16 @@ <PropertyGroup> <DotNetCoreFeed>https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</DotNetCoreFeed> <CoreSetupPackageVersion>2.1.0-preview1-25915-01</CoreSetupPackageVersion> + <MicrosoftNETCoreApp21PackageVersion>$(CoreSetupPackageVersion)</MicrosoftNETCoreApp21PackageVersion> + <!-- We don't set MicrosoftNETCoreAppPackageVersion anywhere in code. However, this may be included in DotNetPackageVersionPropsPath. --> + <MicrosoftNETCoreApp21PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp21PackageVersion> </PropertyGroup> <ItemGroup> <ExternalDependency Include="Microsoft.CSharp" Version="4.5.0-preview1-25914-04" Source="$(DotNetCoreFeed)" Mirror="true" /> <ExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-25711-01" Source="$(DotNetCoreFeed)" Mirror="true" /> <ExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="2.1.0-preview2-25711-01" Source="$(DotNetCoreFeed)" Mirror="true" /> - <ExternalDependency Include="Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" TargetFramework="netcoreapp2.1" Source="$(DotNetCoreFeed)" Mirror="true"> + <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp21PackageVersion)" TargetFramework="netcoreapp2.1" Source="$(DotNetCoreFeed)" Mirror="true"> <!-- Multiple versions of this package required to support all netcoreapp versions --> <NoWarn>KRB2004</NoWarn> <VariableName>MicrosoftNETCoreApp21PackageVersion</VariableName> @@ -243,7 +248,7 @@ <!-- nuget.org --> <PropertyGroup> <DefaultNuGetFeed>https://api.nuget.org/v3/index.json</DefaultNuGetFeed> - <MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion> + <MicrosoftNETCoreApp20PackageVersion>2.0.3</MicrosoftNETCoreApp20PackageVersion> </PropertyGroup> <ItemGroup> diff --git a/build/repo.props b/build/repo.props index 951d62b431..1cf5614923 100644 --- a/build/repo.props +++ b/build/repo.props @@ -19,7 +19,9 @@ <ItemGroup> <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by universe --> <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" /> - <DotNetCoreRuntime Include="$(CoreSetupPackageVersion)" /> + <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" + Feed="$(DotNetAssetRootUrl)" + FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" /> </ItemGroup> <Import Project="dependencies.props" /> @@ -32,6 +32,9 @@ The path to the configuration file that stores values. Defaults to korebuild.jso .PARAMETER PackageVersionPropsUrl (optional) the url of the package versions props path containing dependency versions. +.PARAMETER AssetRootUrl +(optional) the base url for acquiring build assets from an orchestrated build + .PARAMETER AccessTokenSuffix (optional) the query string to append to any blob store access for PackageVersionPropsUrl, if any. @@ -198,7 +201,15 @@ if ($PackageVersionPropsUrl) { } if ($RestoreSources) { - $MSBuildArguments = "-p:DotNetRestoreSources=$RestoreSources" + $MSBuildArguments += "-p:DotNetRestoreSources=$RestoreSources" +} + +if ($AssetRootUrl) { + $MSBuildArguments += "-p:DotNetAssetRootUrl=$AssetRootUrl" +} + +if ($AccessTokenSuffix) { + $MSBuildArguments += "-p:DotNetAssetRootAccessTokenSuffix=$AccessTokenSuffix" } # Execute |