[Darc-Update] Update dependencies from build 20181109.22 of https://g…

…ithub.com/dotnet/arcade (#2658) * Updating version files * Updating version files * Updating version files * Fixing 3rd party libraries.
dotnet · Nov 12, 2018 · 6d03d9a · 6d03d9a
1 parent f2d60b4
commit 6d03d9a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 6 deletions.
diff --git a/eng/Signing.props b/eng/Signing.props
@@ -0,0 +1,25 @@
+<Project>
+  <ItemGroup>
+    <!-- 
+      Suppresses code signing on this file because it causes a false-positive on SIGN001.
+    -->
+    <FileSignInfo Include="Microsoft.DotNet.Cli.Utils.resources.dll" CertificateName="None" />
+  </ItemGroup>
+
+  <!--
+    These are third party libraries that we use in Arcade. We need to sign them even if they
+    are already signed. However, they must be signed with a 3rd party certificate.
+  -->
+  <ItemGroup>
+    <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="CommandLine.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="FluentAssertions.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="FluentAssertions.Core.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="FluentAssertions.Json.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="Microsoft.3rdpartytools.MarkdownLog.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="xunit.performance.api.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="xunit.performance.core.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="xunit.performance.execution.dll" CertificateName="3PartySHA2" />
+    <FileSignInfo Include="xunit.performance.metrics.dll" CertificateName="3PartySHA2" />
+  </ItemGroup>
+</Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -2,9 +2,9 @@
 <Dependencies>
   <ProductDependencies></ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18556.6">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18559.22">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7b0a1f028490bbf18ab1565998719315f2de22e7</Sha>
+      <Sha>83ae1a636871cf7f2f4d229047c6535ace11081c</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml
@@ -11,7 +11,7 @@ phases:
     dependsOn: ${{ parameters.dependsOn }}
     queue: ${{ parameters.queue }}
     variables:
-      config: ${{ parameters.configuration }}
+      _BuildConfig: ${{ parameters.configuration }}
     steps:
       - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
         - task: DownloadBuildArtifacts@0
@@ -32,7 +32,15 @@ phases:
             /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
             /p:BuildAssetRegistryToken=$(MaestroAccessToken)
             /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
-            /p:Configuration=$(config)
+            /p:Configuration=$(_BuildConfig)
           displayName: Publish Build Assets
           condition: ${{ parameters.condition }}
           continueOnError: ${{ parameters.continueOnError }}
+        - task: PublishBuildArtifacts@1
+          displayName: Publish Logs to VSTS
+          inputs:
+            PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)'
+            PublishLocation: Container
+            ArtifactName: $(Agent.Os)_Asset_Registry_Publish
+          continueOnError: true
+          condition: always()
diff --git a/eng/common/templates/steps/helix-publish.yml b/eng/common/templates/steps/helix-publish.yml
@@ -23,7 +23,7 @@ steps:
       command: custom
       projects: eng/common/helixpublish.proj
       custom: msbuild
-      arguments: '/t:test /p:Language=msbuild'
+      arguments: '/t:test /p:Language=msbuild /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\SendToHelix.binlog'
     displayName: Send job to Helix
     env:
       HelixSource: ${{ parameters.HelixSource }}

diff --git a/global.json b/global.json
@@ -4,6 +4,6 @@
     "vswhere": "2.2.7"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18556.6"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18559.22"
   }
 }