Infrastructure updates: CLI:master -> release/2.1.3xx (#8541)
* Repairing the first pass call to 'dotnet msbuild'; CLI:master (#8488) * '$ExtraParametersNoTargets', which is used on the first pass call to 'dotnet msbuild', currently is of type 'string' not 'List'1' as is '$ExtraParameters'. This results in the non-honoring of any parameter other than parameter one. Solution: Make a copy of '$ExtraParameters' to '$ExtraParametersNoTargets' of type 'List'1' and remove the targets from the list. * Swallow the boolean output from '$ExtraParametersNoTargets.Remove' * Specifically capture "/t:" or "/target:" only. * The "${arg,,}" syntax works well on dev and Jenkins OSX machines but does not work correctly on VSO build machines [likely a lower version of bash on VSO machines]. Therefore, using 'awk' to transforming to lower case. (#8497) * Orchestrated final publish; CLI:master (#8504) * Orchestrated final publish: https://github.com/dotnet/core-eng/issues/2407 * Changes per code review... * The orchestrated "PackageVersion" type variables should not be used in any of the 'proj' files of the built build tools under: "build_projects"
This commit is contained in:
parent
e260e79229
commit
47da513313
8 changed files with 16 additions and 10 deletions
|
@ -1,9 +1,10 @@
|
|||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Product>Sdk</Product>
|
||||
<IsNotOrchestratedPublish>true</IsNotOrchestratedPublish>
|
||||
<IsNotOrchestratedPublish Condition="'$(PB_PublishBlobFeedUrl)' != ''">false</IsNotOrchestratedPublish>
|
||||
<BlobStoragePartialRelativePath>Sdk</BlobStoragePartialRelativePath>
|
||||
<BlobStoragePartialRelativePath Condition="'$(IsNotOrchestratedPublish)' == 'false'">assets/$(BlobStoragePartialRelativePath)</BlobStoragePartialRelativePath>
|
||||
<BlobStoragePartialRelativePath>$(Product)</BlobStoragePartialRelativePath>
|
||||
<BlobStoragePartialRelativePath Condition="'$(IsNotOrchestratedPublish)' == 'false'">assets/$(Product)</BlobStoragePartialRelativePath>
|
||||
|
||||
<!-- Values related to the download of assets from blob storage -->
|
||||
<DefaultCoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</DefaultCoreSetupBlobRootUrl>
|
||||
|
|
|
@ -68,7 +68,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.1.0-prerelease-02411-04</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0-preview2-25331-01</DotnetDebToolVersion>
|
||||
<BuildTasksFeedToolVersion>2.1.0-prerelease-02411-04</BuildTasksFeedToolVersion>
|
||||
<BuildTasksFeedToolVersion>2.1.0-prerelease-02430-04</BuildTasksFeedToolVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -84,6 +84,7 @@
|
|||
ManifestBuildId="$(FullNugetVersion)"
|
||||
ManifestCommit="$(CommitHash)"
|
||||
ManifestName="$(BuildName)"
|
||||
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
|
||||
Overwrite="false"
|
||||
PublishFlatContainer="true"
|
||||
SkipCreateManifest="$(IsNotOrchestratedPublish)" />
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
ManifestBuildId="$(FullNugetVersion)"
|
||||
ManifestCommit="$(CommitHash)"
|
||||
ManifestName="$(BuildName)"
|
||||
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
|
||||
Overwrite="$(OverwriteOnPublish)"
|
||||
PublishFlatContainer="true"
|
||||
SkipCreateManifest="$(IsNotOrchestratedPublish)" />
|
||||
|
@ -51,6 +52,7 @@
|
|||
ManifestBuildId="$(FullNugetVersion)"
|
||||
ManifestCommit="$(CommitHash)"
|
||||
ManifestName="$(BuildName)"
|
||||
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
|
||||
Overwrite="$(OverwriteOnPublish)"
|
||||
PublishFlatContainer="true"
|
||||
SkipCreateManifest="$(IsNotOrchestratedPublish)" />
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
ManifestBuildId="$(FullNugetVersion)"
|
||||
ManifestCommit="$(CommitHash)"
|
||||
ManifestName="$(BuildName)"
|
||||
ManifestBuildData="ProductVersion=$(FullNugetVersion)"
|
||||
Overwrite="true"
|
||||
PublishFlatContainer="false"
|
||||
SkipCreateManifest="$(IsNotOrchestratedPublish)" />
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="2.1.0-preview1-26116-04" />
|
||||
<PackageReference Include="Microsoft.Build" Version="15.4.8" />
|
||||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.4.8" />
|
||||
<PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
|
||||
|
|
|
@ -29,14 +29,14 @@ if($Help)
|
|||
|
||||
# The first 'pass' call to "dotnet msbuild build.proj" has a hard-coded "WriteDynamicPropsToStaticPropsFiles" target
|
||||
# therefore, this call should not have other targets defined. Remove all targets passed in as 'extra parameters'.
|
||||
$ExtraParametersNoTargets = ""
|
||||
if ($ExtraParameters)
|
||||
{
|
||||
foreach ($param in $ExtraParameters.split())
|
||||
$ExtraParametersNoTargets = $ExtraParameters.GetRange(0,$ExtraParameters.Count)
|
||||
foreach ($param in $ExtraParameters)
|
||||
{
|
||||
if((-not $param.StartsWith("/t")) -and (-not $param.StartsWith("/T")))
|
||||
if(($param.StartsWith("/t:", [StringComparison]::OrdinalIgnoreCase)) -or ($param.StartsWith("/target:", [StringComparison]::OrdinalIgnoreCase)))
|
||||
{
|
||||
$ExtraParametersNoTargets += "{0} " -f $param
|
||||
$ExtraParametersNoTargets.Remove("$param") | Out-Null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -130,8 +130,9 @@ done
|
|||
argsnotargets=( )
|
||||
for arg in ${args[@]}
|
||||
do
|
||||
if [[ $arg != '/t'* ]] && [[ $arg != '/T'* ]]; then
|
||||
argsnotargets+=($arg)
|
||||
arglower="$(echo $arg | awk '{print tolower($0)}')"
|
||||
if [[ $arglower != '/t:'* ]] && [[ $arglower != '/target:'* ]]; then
|
||||
argsnotargets+=($arg)
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue