Skip to content

Commit 868387b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/arcade (dotnet#4251)
* Update dependencies from https://github.com/dotnet/arcade build 20190317.10 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19167.10 * License change demanded by Arcade See dotnet/arcade#2003. * [Arcade] Update .NET SDK, NuGet version This is required by new enforcement of LicenseExpression, which isn't supported by versions of NuGet before 4.9, included with MSBuilds before 15.9. * Convert Localization package to license expression
1 parent c44dc74 commit 868387b

11 files changed

+46
-15
lines changed

‎LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
MSBuild
2-
31
The MIT License (MIT)
42

53
Copyright (c) .NET Foundation and contributors
64

5+
All rights reserved.
6+
77
Permission is hereby granted, free of charge, to any person obtaining a copy
88
of this software and associated documentation files (the "Software"), to deal
99
in the Software without restriction, including without limitation the rights

‎eng/Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<NuGetPackageVersion Condition="'$(NuGetPackageVersion)' == ''">4.8.0-rtm.5362</NuGetPackageVersion>
4+
<NuGetPackageVersion Condition="'$(NuGetPackageVersion)' == ''">4.9.0-rtm.5658</NuGetPackageVersion>
55
<NuGetBuildTasksVersion Condition="'$(NuGetBuildTasksVersion)' == ''">$(NuGetPackageVersion)</NuGetBuildTasksVersion>
66
<NuGetCommandsVersion Condition="'$(NuGetCommandsVersion)' == ''">$(NuGetPackageVersion)</NuGetCommandsVersion>
77
<NuGetProtocolVersion Condition="'$(NuGetProtocolVersion)' == ''">$(NuGetPackageVersion)</NuGetProtocolVersion>

‎eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19162.7">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19167.10">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>443dea11f8649fe12fedf60cfab0a4b2b20bd153</Sha>
6+
<Sha>de7be3ba62b92e5c48c36876c851a14f154444af</Sha>
77
</Dependency>
88
</ToolsetDependencies>
99
</Dependencies>

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
</PropertyGroup>
3030
<!-- Toolset Dependencies -->
3131
<PropertyGroup>
32-
<DotNetCliVersion>2.1.401</DotNetCliVersion>
32+
<DotNetCliVersion>2.1.503</DotNetCliVersion>
3333
</PropertyGroup>
3434
</Project>

‎eng/common/PublishToPackageFeed.proj

+22-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,17 @@
1111
</PropertyGroup>
1212

1313
<Import Project="$(MSBuildThisFileDirectory)DefaultVersions.props" Condition="Exists('$(MSBuildThisFileDirectory)DefaultVersions.props')" />
14+
15+
<!--
16+
This won't be necessary once we solve this issue:
17+
https://github.com/dotnet/arcade/issues/2266
18+
-->
19+
<Import Project="$(MSBuildThisFileDirectory)ArtifactsCategory.props" Condition="Exists('$(MSBuildThisFileDirectory)ArtifactsCategory.props')" />
1420

1521
<Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" />
1622

1723
<Target Name="PublishToFeed">
18-
<Error Condition="'$(TargetStaticFeed)' == ''" Text="TargetStaticFeed: Target feed for publishing assets wasn't provided." />
24+
<Error Condition="'$(ArtifactsCategory)' == ''" Text="ArtifactsCategory: The artifacts' category produced by the build wasn't provided." />
1925
<Error Condition="'$(AccountKeyToStaticFeed)' == ''" Text="AccountKeyToStaticFeed: Account key for target feed wasn't provided." />
2026
<Error Condition="'$(ManifestsBasePath)' == ''" Text="Full path to asset manifests directory wasn't provided." />
2127
<Error Condition="'$(BlobBasePath)' == '' AND '$(PackageBasePath)' == ''" Text="A valid full path to BlobBasePath of PackageBasePath is required." />
@@ -26,7 +32,21 @@
2632
</ItemGroup>
2733

2834
<Error Condition="'@(ManifestFiles)' == ''" Text="No manifest file was found in the provided path: $(ManifestsBasePath)" />
29-
35+
36+
<!--
37+
For now the type of packages being published will be informed for the whole build.
38+
Eventually this will be specified on a per package basis:
39+
TODO: https://github.com/dotnet/arcade/issues/2266
40+
-->
41+
<PropertyGroup>
42+
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == '.NETCORE'">https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</TargetStaticFeed>
43+
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == '.NETCOREVALIDATION'">https://dotnetfeed.blob.core.windows.net/arcade-validation/index.json</TargetStaticFeed>
44+
</PropertyGroup>
45+
46+
<Error
47+
Condition="'$(TargetStaticFeed)' == ''"
48+
Text="'$(ArtifactsCategory)' wasn't recognized as a valid artifact category. Valid categories are: '.NetCore' and '.NetCoreValidation'" />
49+
3050
<!-- Iterate publishing assets from each manifest file. -->
3151
<PushArtifactsInManifestToFeed
3252
ExpectedFeedUrl="$(TargetStaticFeed)"

‎eng/common/init-tools-native.ps1

+12-2
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,20 @@ try {
9898
Write-Verbose "Executing '$LocalInstallerCommand'"
9999
Invoke-Expression "$LocalInstallerCommand"
100100
if ($LASTEXITCODE -Ne "0") {
101-
Write-Error "Execution failed"
102-
exit 1
101+
$errMsg = "$ToolName installation failed"
102+
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
103+
Write-Warning $errMsg
104+
$toolInstallationFailure = $true
105+
} else {
106+
Write-Error $errMsg
107+
exit 1
108+
}
103109
}
104110
}
111+
112+
if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
113+
exit 1
114+
}
105115
}
106116
else {
107117
Write-Host "No native tools defined in global.json"

‎eng/common/templates/job/publish-build-assets.yml

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
5353
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
5454
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
55+
/p:PublishUsingPipelines=$(_PublishUsingPipelines)
5556
/p:Configuration=$(_BuildConfig)
5657
condition: ${{ parameters.condition }}
5758
continueOnError: ${{ parameters.continueOnError }}

‎eng/common/templates/steps/send-to-helix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ parameters:
22
HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/
33
HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/'
44
HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number
5-
HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/api/2018-03-14/info/queues for a list of queues
5+
HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues
66
HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group
77
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
88
HelixPostCommands: '' # optional -- commands to run after Helix work item execution

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"tools": {
3-
"dotnet": "2.1.401",
3+
"dotnet": "2.1.503",
44
"vs": {
55
"version": "15.8"
66
}
77
},
88
"msbuild-sdks": {
99
"Microsoft.Build.CentralPackageVersions": "2.0.1",
10-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19162.7"
10+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19167.10"
1111
}
1212
}

‎src/Package/Localization/Microsoft.Build.Localization.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>
99
<requireLicenseAcceptance>true</requireLicenseAcceptance>
10-
<licenseUrl>$licenseUrl$</licenseUrl>
10+
<license type="expression">$licenseExpression$</license>
1111
<projectUrl>$projectUrl$</projectUrl>
1212
<iconUrl>$iconUrl$</iconUrl>
1313
<description>This package contains the localized satellite assemblies for MSBuild. Reference this package only if you want msbuild output to be localized in cs;de;en;es;fr;it;ja;ko;pl;pt-BR;ru;tr;zh-Hans;zh-Hant.</description>

‎src/Package/NuspecProject.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<Target Name="SetNuspecProperties" DependsOnTargets="GetNuGetPackageVersionEx">
1414
<PropertyGroup>
1515
<NuspecProperties>$(NuspecProperties);version=$(PackageVersion)</NuspecProperties>
16-
<NuspecProperties>$(NuspecProperties);licenseUrl=$(PackageLicenseUrl)</NuspecProperties>
16+
<NuspecProperties>$(NuspecProperties);licenseExpression=$(PackageLicenseExpression)</NuspecProperties>
1717
<NuspecProperties>$(NuspecProperties);projectUrl=$(PackageProjectUrl)</NuspecProperties>
1818
<NuspecProperties>$(NuspecProperties);iconUrl=$(PackageIconUrl)</NuspecProperties>
1919
<NuspecBasePath>$(OutDir)</NuspecBasePath>

0 commit comments

Comments
 (0)