Merge branch 'release/2.1' into dev
This commit is contained in:
John Luo
commit
4c79a2fe59
|
|
@ -15,7 +15,7 @@
|
|||
<GeneratedPackageVersionPropsPath>$(IntermediateDir)dependencies.g.props</GeneratedPackageVersionPropsPath>
|
||||
<GeneratedRestoreSourcesPropsPath>$(IntermediateDir)sources.g.props</GeneratedRestoreSourcesPropsPath>
|
||||
|
||||
<PrepareDependsOn>$(PrepareDependsOn);VerifyPackageArtifactConfig;PrepareOutputPaths</PrepareDependsOn>
|
||||
<PrepareDependsOn>SetTeamCityBuildNumberToVersion;$(PrepareDependsOn);VerifyPackageArtifactConfig;PrepareOutputPaths</PrepareDependsOn>
|
||||
<CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn>
|
||||
<RestoreDependsOn>$(RestoreDependsOn);InstallDotNet;RestoreExternalDependencies</RestoreDependsOn>
|
||||
<CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn>
|
||||
|
|
|
|||
|
|
@ -4,11 +4,7 @@
|
|||
#
|
||||
|
||||
# Dockerfile that creates a container suitable to build dotnet-cli
|
||||
FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-c982313-20174116044113
|
||||
|
||||
# Install from sudo main package TODO This package needs to be mirrored
|
||||
RUN yum install -y https://www.sudo.ws/sudo/dist/packages/RHEL/7/sudo-1.8.20-3.el7.x86_64.rpm \
|
||||
&& yum clean all
|
||||
FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
|
||||
|
||||
# Setup User to match Host User, and give superuser permissions
|
||||
ARG USER_ID=0
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<Import Project="$(DotNetRestoreSourcesPropsPath)" Condition="'$(DotNetRestoreSourcesPropsPath)' != ''" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
||||
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
|
||||
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
|
||||
$(RestoreSources);
|
||||
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
|
||||
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
|
||||
</RestoreSources>
|
||||
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
|
||||
$(RestoreSources);
|
||||
https://api.nuget.org/v3/index.json;
|
||||
</RestoreSources>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="RS.References" Version="$(PackageVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="GetPackageDefinitions" Returns="@(_PackageDefinitions)">
|
||||
<ResolvePackageDependencies ProjectPath="$(MSBuildThisFileFullPath)" ProjectAssetsFile="$(ProjectAssetsFile)">
|
||||
<Output TaskParameter="PackageDefinitions" ItemName="_PackageDefinitions" />
|
||||
</ResolvePackageDependencies>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
|
||||
|
||||
<PropertyGroup>
|
||||
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
|
||||
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
|
||||
$(RestoreSources);
|
||||
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
|
||||
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
|
||||
</RestoreSources>
|
||||
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
|
||||
$(RestoreSources);
|
||||
https://api.nuget.org/v3/index.json;
|
||||
</RestoreSources>
|
||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
||||
<IncludeBuildOutput>false</IncludeBuildOutput>
|
||||
<IncludeSymbols>false</IncludeSymbols>
|
||||
<EnableApiCheck>false</EnableApiCheck>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
8
run.ps1
8
run.ps1
|
|
@ -44,6 +44,9 @@ The path to the configuration file that stores values. Defaults to korebuild.jso
|
|||
.PARAMETER RestoreSources
|
||||
(optional) Semi-colon delimited list of additional NuGet feeds to use as part of restore.
|
||||
|
||||
.PARAMETER ProductBuildId
|
||||
(optional) The product build ID for correlation with orchestrated builds.
|
||||
|
||||
.PARAMETER MSBuildArguments
|
||||
Additional MSBuild arguments to be passed through.
|
||||
|
||||
|
|
@ -83,6 +86,7 @@ param(
|
|||
[string]$AccessTokenSuffix = $null,
|
||||
[string]$RestoreSources = $null,
|
||||
[string]$AssetRootUrl = $null,
|
||||
[string]$ProductBuildId = $null,
|
||||
[Parameter(ValueFromRemainingArguments = $true)]
|
||||
[string[]]$MSBuildArguments
|
||||
)
|
||||
|
|
@ -221,6 +225,10 @@ if ($AccessTokenSuffix) {
|
|||
$MSBuildArguments += "-p:DotNetAssetRootAccessTokenSuffix=$AccessTokenSuffix"
|
||||
}
|
||||
|
||||
if ($ProductBuildId) {
|
||||
$MSBuildArguments += "-p:DotNetProductBuildId=$ProductBuildId"
|
||||
}
|
||||
|
||||
# Execute
|
||||
|
||||
$korebuildPath = Get-KoreBuild
|
||||
|
|
|
|||
12
run.sh
12
run.sh
|
|
@ -22,6 +22,7 @@ package_version_props_url=''
|
|||
asset_root_url=''
|
||||
access_token_suffix=''
|
||||
restore_sources=''
|
||||
product_build_id=''
|
||||
msbuild_args=()
|
||||
|
||||
#
|
||||
|
|
@ -44,6 +45,7 @@ __usage() {
|
|||
echo " --package-version-props-url <URL> The url of the package versions props path containing dependency versions."
|
||||
echo " --access-token <Token> The query string to append to any blob store access for PackageVersionPropsUrl, if any."
|
||||
echo " --restore-sources <Sources> Semi-colon delimited list of additional NuGet feeds to use as part of restore."
|
||||
echo " --product-build-id <ID> The product build ID for correlation with orchestrated builds."
|
||||
echo " -u|--update Update to the latest KoreBuild even if the lock file is present."
|
||||
echo " --reinstall Reinstall KoreBuild."
|
||||
echo ""
|
||||
|
|
@ -202,6 +204,12 @@ while [[ $# -gt 0 ]]; do
|
|||
[ -z "${1+x}" ] && __error "Missing value for parameter --asset-root-url" && __usage
|
||||
asset_root_url="$1"
|
||||
;;
|
||||
--product-build-id|-ProductBuildId)
|
||||
shift
|
||||
# This parameter can be an empty string, but it should be set
|
||||
[ -z "${1+x}" ] && __error "Missing value for parameter --product-build-id" && __usage
|
||||
product_build_id="$1"
|
||||
;;
|
||||
-u|--update|-Update)
|
||||
update=true
|
||||
;;
|
||||
|
|
@ -272,6 +280,10 @@ if [ ! -z "$access_token_suffix" ]; then
|
|||
msbuild_args[${#msbuild_args[*]}]="-p:DotNetAssetRootAccessTokenSuffix=$access_token_suffix"
|
||||
fi
|
||||
|
||||
if [ ! -z "$product_build_id" ]; then
|
||||
msbuild_args[${#msbuild_args[*]}]="-p:DotNetProductBuildId=$product_build_id"
|
||||
fi
|
||||
|
||||
[ -z "$channel" ] && channel='dev'
|
||||
[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.App" Version="[$(AppMetapackageVersion)]" PrivateAssets="Build" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.App" Version="[$(AppMetapackageVersion)]" PrivateAssets="None" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project InitialTargets="EnsureTFMCompatibility">
|
||||
<Target Name="EnsureTFMCompatibility">
|
||||
<Project>
|
||||
<Target Name="EnsureTFMCompatibility" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
|
||||
<Error
|
||||
Text="This version of Microsoft.AspNetCore.All is only compatible with the netcoreapp2.1 target framework."
|
||||
Text="This version of Microsoft.AspNetCore.All is only compatible with the netcoreapp2.1 target framework. Please target netcoreapp2.1 or choose a version of Microsoft.AspNetCore.All compatible with $(TargetFramework)."
|
||||
Condition="'$(TargetFramework)' != 'netcoreapp2.1'"/>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<Content Include="build\$(TargetFramework)\*.props" PackagePath="%(Identity)" />
|
||||
<Content Include="build\$(TargetFramework)\*.targets" PackagePath="%(Identity)" />
|
||||
<Content Include="lib\$(TargetFramework)\_._" PackagePath="%(Identity)" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<Project>
|
||||
<Target Name="EnsureTFMCompatibility" BeforeTargets="_CheckForInvalidConfigurationAndPlatform">
|
||||
<Error
|
||||
Text="This version of Microsoft.AspNetCore.App is only compatible with the netcoreapp2.1 target framework. Please target netcoreapp2.1 or choose a version of Microsoft.AspNetCore.App compatible with $(TargetFramework)."
|
||||
Condition="'$(TargetFramework)' != 'netcoreapp2.1'"/>
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -9,4 +9,5 @@
|
|||
<!-- Even though we build from 'dev', this is set to 'master' to align with the dotnet-CLI channel name for their 'dev' branch. -->
|
||||
<SharedFxCliBlobChannel>master</SharedFxCliBlobChannel>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue