summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>2019-03-29 11:02:57 -0400
committerStephen Toub <stoub@microsoft.com>2019-03-29 11:02:57 -0400
commit88c3796b9322f93df13cc8d665ea6e0c981913ad (patch)
tree9abbaf00d8537f1d730376304bed85cd467f504c
parent9f2b33e9e124c1a6be86fa83c21a1a8134a9ca10 (diff)
downloadcoreclr-88c3796b9322f93df13cc8d665ea6e0c981913ad.tar.gz
coreclr-88c3796b9322f93df13cc8d665ea6e0c981913ad.tar.bz2
coreclr-88c3796b9322f93df13cc8d665ea6e0c981913ad.zip
Update dependencies from https://github.com/dotnet/arcade build 20190329.1 (#23554)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19179.1 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19179.1
-rw-r--r--eng/Version.Details.xml8
-rw-r--r--eng/common/PublishToPackageFeed.proj2
-rw-r--r--eng/common/SigningValidation.proj81
-rw-r--r--eng/common/tools.ps14
-rw-r--r--global.json4
5 files changed, 92 insertions, 7 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 69326f5598..18154271e5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,13 +3,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19177.11">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19179.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
+ <Sha>ef139c7533e2e33c5e0946b80cb1aa95d84da868</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19177.11">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19179.1">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
+ <Sha>ef139c7533e2e33c5e0946b80cb1aa95d84da868</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview4.19178.1">
<Uri>https://github.com/dotnet/corefx</Uri>
diff --git a/eng/common/PublishToPackageFeed.proj b/eng/common/PublishToPackageFeed.proj
index 25362ff060..ccb81e8c35 100644
--- a/eng/common/PublishToPackageFeed.proj
+++ b/eng/common/PublishToPackageFeed.proj
@@ -60,7 +60,7 @@
UploadTimeoutInMinutes="$(MaxUploadTimeoutInMinutes)"
AssetManifestPath="%(ManifestFiles.Identity)"
BlobAssetsBasePath="$(BlobBasePath)"
- PackageAssetsBasePath="$(PackageBasePath)" />
+ PackageAssetsBasePath="$(PackageBasePath)"/>
</Target>
<ItemGroup>
diff --git a/eng/common/SigningValidation.proj b/eng/common/SigningValidation.proj
new file mode 100644
index 0000000000..17e40d1287
--- /dev/null
+++ b/eng/common/SigningValidation.proj
@@ -0,0 +1,81 @@
+<!--
+ This MSBuild file is intended to be used as the body of the default
+ publishing release pipeline. The release pipeline will use this file
+ to invoke the the SignCheck tool to validate that packages about to
+ be published are correctly signed.
+
+ Parameters:
+
+ - PackageBasePath : Directory containing all files that need to be validated.
+ - SignCheckVersion : Version of SignCheck package to be used.
+ - SignValidationExclusionList : ItemGroup containing exclusion list to be forwarded to SignCheck.
+ - EnableJarSigningCheck : Whether .jar files should be validated.
+ - EnableStrongNameCheck : Whether strong name check should be performed.
+-->
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <TargetFramework>netcoreapp2.1</TargetFramework>
+ </PropertyGroup>
+
+ <!--
+ From 'Signing.props' we import $(SignValidationExclusionList)
+ -->
+ <Import Project="$(MSBuildThisFileDirectory)Signing.props" Condition="Exists('$(MSBuildThisFileDirectory)Signing.props')" />
+
+ <Target Name="ValidateSigning">
+ <PropertyGroup>
+ <SignCheckToolPath>$(NuGetPackageRoot)Microsoft.DotNet.SignCheck\$(SignCheckVersion)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckToolPath>
+
+ <SignCheckInputDir>$(PackageBasePath)</SignCheckInputDir>
+ <SignCheckLog>signcheck.log</SignCheckLog>
+ <SignCheckErrorLog>signcheck.errors.log</SignCheckErrorLog>
+ <SignCheckExclusionsFile>signcheck.exclusions.txt</SignCheckExclusionsFile>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <!--
+ Documentation for these arguments is available here:
+ https://github.com/dotnet/arcade/tree/master/src/SignCheck
+ -->
+ <SignCheckArgs Include="--recursive" />
+ <SignCheckArgs Include="--traverse-subfolders" />
+ <SignCheckArgs Include="--file-status AllFiles" />
+ <SignCheckArgs Include="--log-file $(SignCheckLog)" />
+ <SignCheckArgs Include="--error-log-file $(SignCheckErrorLog)" />
+ <SignCheckArgs Include="--input-files $(SignCheckInputDir)" />
+
+ <SignCheckArgs Include="--exclusions-file $(SignCheckExclusionsFile)" Condition="'@(SignValidationExclusionList)' != ''" />
+ <SignCheckArgs Include="--verify-jar" Condition="'$(EnableJarSigningCheck)' == 'true'" />
+ <SignCheckArgs Include="--verify-strongname" Condition="'$(EnableStrongNameCheck)' == 'true'" />
+ </ItemGroup>
+
+ <WriteLinesToFile
+ File="$(SignCheckExclusionsFile)"
+ Lines="@(SignValidationExclusionList)"
+ Condition="'@(SignValidationExclusionList)' != ''"
+ Overwrite="true"
+ Encoding="Unicode"/>
+
+ <!--
+ IgnoreExitCode='true' because the tool doesn't return '0' on success.
+ -->
+ <Exec
+ Command="&quot;$(SignCheckToolPath)&quot; @(SignCheckArgs, ' ')"
+ IgnoreExitCode='true'
+ ConsoleToMsBuild="false"
+ StandardErrorImportance="high" />
+
+ <Error
+ Text="Signing validation failed. Check $(SignCheckErrorLog) for more information."
+ Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
+
+ <Message
+ Text="##vso[artifact.upload containerfolder=LogFiles;artifactname=LogFiles]{SignCheckErrorLog}"
+ Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
+
+ </Target>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.DotNet.SignCheck" Version="$(SignCheckVersion)" />
+ </ItemGroup>
+</Project>
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index de7523cae5..5c4a129c86 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -518,6 +518,10 @@ Create-Directory $TempDir
Create-Directory $LogDir
if ($ci) {
+ Write-Host "##vso[task.setvariable variable=Artifacts]$ArtifactsDir"
+ Write-Host "##vso[task.setvariable variable=Artifacts.Toolset]$ToolsetDir"
+ Write-Host "##vso[task.setvariable variable=Artifacts.Log]$LogDir"
+
$env:TEMP = $TempDir
$env:TMP = $TempDir
}
diff --git a/global.json b/global.json
index 68df6af2ee..86605fab07 100644
--- a/global.json
+++ b/global.json
@@ -7,7 +7,7 @@
"python": "2.7.15"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19177.11",
- "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19177.11"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19179.1",
+ "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19179.1"
}
}