huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add support for automatically installing new versions of the 2.1 runtime (#676)

This commit is contained in:
Nate McMaster 2017-11-30 15:03:51 -08:00 committed by GitHub
parent 740b81e989
commit 1db6eb0823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/dependencies.props
View File

@ -1,5 +1,7 @@
<Project> <Project>
<Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ExternalDependency> <ExternalDependency>
<!-- The NuGet package version. Floating versions not allowed. --> <!-- The NuGet package version. Floating versions not allowed. -->
@ -29,13 +31,16 @@
<PropertyGroup> <PropertyGroup>
<DotNetCoreFeed>https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</DotNetCoreFeed> <DotNetCoreFeed>https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</DotNetCoreFeed>
<CoreSetupPackageVersion>2.1.0-preview1-25915-01</CoreSetupPackageVersion> <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> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ExternalDependency Include="Microsoft.CSharp" Version="4.5.0-preview1-25914-04" Source="$(DotNetCoreFeed)" Mirror="true" /> <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.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.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 --> <!-- Multiple versions of this package required to support all netcoreapp versions -->
<NoWarn>KRB2004</NoWarn> <NoWarn>KRB2004</NoWarn>
<VariableName>MicrosoftNETCoreApp21PackageVersion</VariableName> <VariableName>MicrosoftNETCoreApp21PackageVersion</VariableName>
@ -243,7 +248,7 @@
<!-- nuget.org --> <!-- nuget.org -->
<PropertyGroup> <PropertyGroup>
<DefaultNuGetFeed>https://api.nuget.org/v3/index.json</DefaultNuGetFeed> <DefaultNuGetFeed>https://api.nuget.org/v3/index.json</DefaultNuGetFeed>
<MicrosoftNETCoreApp20PackageVersion>2.0.0</MicrosoftNETCoreApp20PackageVersion> <MicrosoftNETCoreApp20PackageVersion>2.0.3</MicrosoftNETCoreApp20PackageVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
build/repo.props
View File

@ -19,7 +19,9 @@
<ItemGroup> <ItemGroup>
<!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by universe --> <!-- Explicitly require the 2.0.x and 2.1.0-* version of shared runtime used by universe -->
<DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" /> <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
<DotNetCoreRuntime Include="$(CoreSetupPackageVersion)" /> <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)"
Feed="$(DotNetAssetRootUrl)"
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
</ItemGroup> </ItemGroup>
<Import Project="dependencies.props" /> <Import Project="dependencies.props" />

13
run.ps1
View File

@ -32,6 +32,9 @@ The path to the configuration file that stores values. Defaults to korebuild.jso
.PARAMETER PackageVersionPropsUrl .PARAMETER PackageVersionPropsUrl
(optional) the url of the package versions props path containing dependency versions. (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 .PARAMETER AccessTokenSuffix
(optional) the query string to append to any blob store access for PackageVersionPropsUrl, if any. (optional) the query string to append to any blob store access for PackageVersionPropsUrl, if any.
@ -198,7 +201,15 @@ if ($PackageVersionPropsUrl) {
} }
if ($RestoreSources) { if ($RestoreSources) {
$MSBuildArguments = "-p:DotNetRestoreSources=$RestoreSources" $MSBuildArguments += "-p:DotNetRestoreSources=$RestoreSources"
}
if ($AssetRootUrl) {
$MSBuildArguments += "-p:DotNetAssetRootUrl=$AssetRootUrl"
}
if ($AccessTokenSuffix) {
$MSBuildArguments += "-p:DotNetAssetRootAccessTokenSuffix=$AccessTokenSuffix"
} }
# Execute # Execute