Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit c0453ad

Browse files
ViktorHoferViktorHofer
committed
Darc update from build '20190330.1' without GenAPI
1 parent c141b8c commit c0453ad

File tree

6 files changed

+123
-38
lines changed

6 files changed

+123
-38
lines changed

‎eng/Version.Details.xml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,61 +30,61 @@
3030
<Uri>https://github.com/dotnet/corefx</Uri>
3131
<Sha>9da775f39d7cd3a20ae4732b96d7174ca634339a</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19177.11">
33+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19180.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
35+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
3636
</Dependency>
3737
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19177.2">
3838
<Uri>https://github.com/dotnet/standard</Uri>
3939
<Sha>95b8ab66649877d199c425c52d60b9b46a839d60</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19177.11">
41+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19180.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
43+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19177.11">
45+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19180.1">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
47+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.SourceRewriter" Version="1.0.0-beta.19177.11">
49+
<Dependency Name="Microsoft.DotNet.SourceRewriter" Version="1.0.0-beta.19180.1">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
51+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19177.11">
53+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19180.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
55+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
5656
</Dependency>
5757
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19177.11">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
59+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19177.11">
61+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19180.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
63+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19177.11">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19180.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
67+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19177.11">
69+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19180.1">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
71+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19177.11">
73+
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19180.1">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
75+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19177.11">
77+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19180.1">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
79+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19177.11">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19180.1">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
83+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19177.11">
85+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19180.1">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>69f276904fdd6d8f81404b857f295537894b81d3</Sha>
87+
<Sha>1121b186b4770369f771e86c691603ffb0926501</Sha>
8888
</Dependency>
8989
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190314.1">
9090
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@
2121
</PropertyGroup>
2222
<PropertyGroup>
2323
<!-- Arcade dependencies -->
24-
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetApiCompatPackageVersion>
25-
<MicrosoftDotNetSourceRewriterPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetSourceRewriterPackageVersion>
26-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetCodeAnalysisPackageVersion>
27-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetGenAPIPackageVersion>
24+
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19180.1</MicrosoftDotNetApiCompatPackageVersion>
25+
<MicrosoftDotNetSourceRewriterPackageVersion>1.0.0-beta.19180.1</MicrosoftDotNetSourceRewriterPackageVersion>
26+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19180.1</MicrosoftDotNetCodeAnalysisPackageVersion>
27+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19180.1</MicrosoftDotNetGenAPIPackageVersion>
2828
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetGenFacadesPackageVersion>
29-
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19177.11</MicrosoftDotNetXUnitExtensionsPackageVersion>
30-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetBuildTasksPackagingPackageVersion>
31-
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetCoreFxTestingPackageVersion>
32-
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
33-
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19177.11</MicrosoftDotNetBuildTasksFeedPackageVersion>
34-
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetVersionToolsTasksPackageVersion>
29+
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19180.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
30+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19180.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
31+
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19180.1</MicrosoftDotNetCoreFxTestingPackageVersion>
32+
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19180.1</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
33+
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19180.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
34+
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19180.1</MicrosoftDotNetVersionToolsTasksPackageVersion>
3535
<MicrosoftNetCompilersToolsetVersion>3.1.0-beta1-19172-05</MicrosoftNetCompilersToolsetVersion>
3636
<!-- Core-setup dependencies -->
3737
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview4-27528-01</MicrosoftNETCoreAppPackageVersion>

‎eng/common/PublishToPackageFeed.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
UploadTimeoutInMinutes="$(MaxUploadTimeoutInMinutes)"
6161
AssetManifestPath="%(ManifestFiles.Identity)"
6262
BlobAssetsBasePath="$(BlobBasePath)"
63-
PackageAssetsBasePath="$(PackageBasePath)" />
63+
PackageAssetsBasePath="$(PackageBasePath)"/>
6464
</Target>
6565

6666
<ItemGroup>

‎eng/common/SigningValidation.proj‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<!--
2+
This MSBuild file is intended to be used as the body of the default
3+
publishing release pipeline. The release pipeline will use this file
4+
to invoke the the SignCheck tool to validate that packages about to
5+
be published are correctly signed.
6+
7+
Parameters:
8+
9+
- PackageBasePath : Directory containing all files that need to be validated.
10+
- SignCheckVersion : Version of SignCheck package to be used.
11+
- SignValidationExclusionList : ItemGroup containing exclusion list to be forwarded to SignCheck.
12+
- EnableJarSigningCheck : Whether .jar files should be validated.
13+
- EnableStrongNameCheck : Whether strong name check should be performed.
14+
-->
15+
<Project Sdk="Microsoft.NET.Sdk">
16+
<PropertyGroup>
17+
<TargetFramework>netcoreapp2.1</TargetFramework>
18+
</PropertyGroup>
19+
20+
<!--
21+
From 'Signing.props' we import $(SignValidationExclusionList)
22+
-->
23+
<Import Project="$(MSBuildThisFileDirectory)Signing.props" Condition="Exists('$(MSBuildThisFileDirectory)Signing.props')" />
24+
25+
<Target Name="ValidateSigning">
26+
<PropertyGroup>
27+
<SignCheckToolPath>$(NuGetPackageRoot)Microsoft.DotNet.SignCheck\$(SignCheckVersion)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckToolPath>
28+
29+
<SignCheckInputDir>$(PackageBasePath)</SignCheckInputDir>
30+
<SignCheckLog>signcheck.log</SignCheckLog>
31+
<SignCheckErrorLog>signcheck.errors.log</SignCheckErrorLog>
32+
<SignCheckExclusionsFile>signcheck.exclusions.txt</SignCheckExclusionsFile>
33+
</PropertyGroup>
34+
35+
<ItemGroup>
36+
<!--
37+
Documentation for these arguments is available here:
38+
https://github.com/dotnet/arcade/tree/master/src/SignCheck
39+
-->
40+
<SignCheckArgs Include="--recursive" />
41+
<SignCheckArgs Include="--traverse-subfolders" />
42+
<SignCheckArgs Include="--file-status AllFiles" />
43+
<SignCheckArgs Include="--log-file $(SignCheckLog)" />
44+
<SignCheckArgs Include="--error-log-file $(SignCheckErrorLog)" />
45+
<SignCheckArgs Include="--input-files $(SignCheckInputDir)" />
46+
47+
<SignCheckArgs Include="--exclusions-file $(SignCheckExclusionsFile)" Condition="'@(SignValidationExclusionList)' != ''" />
48+
<SignCheckArgs Include="--verify-jar" Condition="'$(EnableJarSigningCheck)' == 'true'" />
49+
<SignCheckArgs Include="--verify-strongname" Condition="'$(EnableStrongNameCheck)' == 'true'" />
50+
</ItemGroup>
51+
52+
<WriteLinesToFile
53+
File="$(SignCheckExclusionsFile)"
54+
Lines="@(SignValidationExclusionList)"
55+
Condition="'@(SignValidationExclusionList)' != ''"
56+
Overwrite="true"
57+
Encoding="Unicode"/>
58+
59+
<!--
60+
IgnoreExitCode='true' because the tool doesn't return '0' on success.
61+
-->
62+
<Exec
63+
Command="&quot;$(SignCheckToolPath)&quot; @(SignCheckArgs, ' ')"
64+
IgnoreExitCode='true'
65+
ConsoleToMsBuild="false"
66+
StandardErrorImportance="high" />
67+
68+
<Error
69+
Text="Signing validation failed. Check $(SignCheckErrorLog) for more information."
70+
Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
71+
72+
<Message
73+
Text="##vso[artifact.upload containerfolder=LogFiles;artifactname=LogFiles]{SignCheckErrorLog}"
74+
Condition="Exists($(SignCheckErrorLog)) and '$([System.IO.File]::ReadAllText($(SignCheckErrorLog)))' != ''" />
75+
76+
</Target>
77+
78+
<ItemGroup>
79+
<PackageReference Include="Microsoft.DotNet.SignCheck" Version="$(SignCheckVersion)" />
80+
</ItemGroup>
81+
</Project>

‎eng/common/tools.ps1‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,10 @@ Create-Directory $TempDir
518518
Create-Directory $LogDir
519519

520520
if ($ci) {
521+
Write-Host "##vso[task.setvariable variable=Artifacts]$ArtifactsDir"
522+
Write-Host "##vso[task.setvariable variable=Artifacts.Toolset]$ToolsetDir"
523+
Write-Host "##vso[task.setvariable variable=Artifacts.Log]$LogDir"
524+
521525
$env:TEMP = $TempDir
522526
$env:TMP = $TempDir
523527
}

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"dotnet": "2.2.103"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19177.11",
7-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19177.11",
6+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19180.1",
7+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19180.1",
88
"Microsoft.NET.Sdk.IL": "3.0.0-preview4-27527-73"
99
}
1010
}

0 commit comments

Comments
 (0)