Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,69 +30,69 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>35249a0072b41a89ce1542deacb2611c2393dec0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19205.2">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>31a38c14c8a4d06ea59c67706fe4399c1f14368f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SourceRewriter" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.SourceRewriter" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19177.11">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19202.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19202.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19205.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>36bc9d99630b4b544c6f09065dc37c00b4ca90a9</Sha>
<Sha>4217db4a23ffd15abb3771d635b66162994fb9e4</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190314.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
25 changes: 13 additions & 12 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,20 @@
</PropertyGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19202.3</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetSourceRewriterPackageVersion>1.0.0-beta.19202.3</MicrosoftDotNetSourceRewriterPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19202.3</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19202.3</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19205.6</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetSourceRewriterPackageVersion>1.0.0-beta.19205.6</MicrosoftDotNetSourceRewriterPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19205.6</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19205.6</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19177.11</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19202.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19202.3</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19202.3</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19202.3</MicrosoftDotNetCoreFxTestingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19202.3</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19202.3</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19202.3</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19202.3</MicrosoftDotNetVersionToolsTasksPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19205.6</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19205.6</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19205.6</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19205.6</MicrosoftDotNetCoreFxTestingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19205.6</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19205.6</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19205.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19205.6</MicrosoftDotNetVersionToolsTasksPackageVersion>
<MicrosoftNetCompilersToolsetVersion>3.1.0-beta1-19172-05</MicrosoftNetCompilersToolsetVersion>
<!-- Core-setup dependencies -->
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27606-01</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview5-27606-01</MicrosoftNETCoreDotNetHostPackageVersion>
Expand Down
26 changes: 19 additions & 7 deletions eng/common/PublishToPackageFeed.proj
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
<!--
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 PushToStaticFeed task that will read the build asset
manifest and publish the assets described in the manifest to
informed target feeds.
-->
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<!--
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 PushToStaticFeed task that will read the build asset
manifest and publish the assets described in the manifest to
informed target feeds.
-->

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
Expand Down Expand Up @@ -41,6 +43,16 @@
<PropertyGroup>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == '.NETCORE'">https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == '.NETCOREVALIDATION'">https://dotnetfeed.blob.core.windows.net/arcade-validation/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETCORE'">https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETCORETOOLING'">https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ENTITYFRAMEWORKCORE'">https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETEXTENSIONS'">https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'CORECLR'">https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'CORESDK'">https://dotnetfeed.blob.core.windows.net/dotnet-sdk/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'TOOLSINTERNAL'">https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'TOOLSET'">https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'WINDOWSDESKTOP'">https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json</TargetStaticFeed>
<TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'NUGETCLIENT'">https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json</TargetStaticFeed>
</PropertyGroup>

<Error
Expand Down
74 changes: 74 additions & 0 deletions eng/common/PublishToSymbolServers.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<!--
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 PublishSymbols tasks to publish symbols to MSDL and SymWeb.

Parameters:

- PDBArtifactsDirectory : Full path to directory containing PDB files to be published.
- BlobBasePath : Full path containing *.symbols.nupkg packages to be published.
- DotNetSymbolServerTokenMsdl : PAT to access MSDL.
- DotNetSymbolServerTokenSymWeb : PAT to access SymWeb.
- DotNetSymbolExpirationInDays : Expiration days for published packages. Default is 3650.
-->

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>

<Import Project="$(NuGetPackageRoot)microsoft.symboluploader.build.task\$(SymbolUploaderVersion)\build\PublishSymbols.targets" />

<Target Name="PublishSymbols">
<ItemGroup>
<FilesToPublishToSymbolServer Include="$(PDBArtifactsDirectory)\*.pdb"/>
<PackagesToPublishToSymbolServer Include="$(BlobBasePath)\*.symbols.nupkg"/>
</ItemGroup>

<PropertyGroup>
<DotNetSymbolExpirationInDays Condition="'$(DotNetSymbolExpirationInDays)' == ''">3650</DotNetSymbolExpirationInDays>
<PublishToSymbolServer>true</PublishToSymbolServer>
<PublishToSymbolServer Condition="'@(FilesToPublishToSymbolServer)' == '' and '@(PackagesToPublishToSymbolServer)' == ''">false</PublishToSymbolServer>
</PropertyGroup>

<Message
Importance="High"
Text="No symbol package(s) were found to publish."
Condition="$(PublishToSymbolServer) == false" />

<!-- Symbol Uploader: MSDL -->
<Message Importance="High" Text="Publishing symbol packages to MSDL ..." Condition="$(PublishToSymbolServer)" />
<PublishSymbols PackagesToPublish="@(PackagesToPublishToSymbolServer)"
FilesToPublish="@(FilesToPublishToSymbolServer)"
PersonalAccessToken="$(DotNetSymbolServerTokenMsdl)"
SymbolServerPath="https://microsoftpublicsymbols.artifacts.visualstudio.com/DefaultCollection"
ExpirationInDays="$(DotNetSymbolExpirationInDays)"
VerboseLogging="true"
DryRun="false"
ConvertPortablePdbsToWindowsPdbs="false"
PdbConversionTreatAsWarning=""
Condition="$(PublishToSymbolServer)"/>

<!--
Symbol Uploader: SymWeb
Watson, VS insertion testings and the typical internal dev usage require SymWeb.
Currently we need to call the task twice (https://github.com/dotnet/core-eng/issues/3489).
-->
<Message Importance="High" Text="Publishing symbol packages to SymWeb ..." Condition="$(PublishToSymbolServer)" />
<PublishSymbols PackagesToPublish="@(PackagesToPublishToSymbolServer)"
FilesToPublish="@(FilesToPublishToSymbolServer)"
PersonalAccessToken="$(DotNetSymbolServerTokenSymWeb)"
SymbolServerPath="https://microsoft.artifacts.visualstudio.com/DefaultCollection"
ExpirationInDays="$(DotNetSymbolExpirationInDays)"
VerboseLogging="true"
DryRun="false"
ConvertPortablePdbsToWindowsPdbs="false"
PdbConversionTreatAsWarning=""
Condition="$(PublishToSymbolServer)"/>
</Target>

<ItemGroup>
<PackageReference Include="Microsoft.SymbolUploader.Build.Task" Version="$(SymbolUploaderVersion)" />
</ItemGroup>
</Project>
28 changes: 15 additions & 13 deletions eng/common/SigningValidation.proj
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<!--
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.
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<!--
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:
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">
- 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.
-->

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/darc-init.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function InstallDarcCli ($darcVersion) {
# Until we can anonymously query the BAR API for the latest arcade-services
# build applied to the PROD channel, this is hardcoded.
if (-not $darcVersion) {
$darcVersion = '1.1.0-beta.19175.6'
$darcVersion = '1.1.0-beta.19205.4'
}

$arcadeServicesSource = 'https://dotnetfeed.blob.core.windows.net/dotnet-arcade/index.json'
Expand Down
2 changes: 1 addition & 1 deletion eng/common/darc-init.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

source="${BASH_SOURCE[0]}"
darcVersion="1.1.0-beta.19175.6"
darcVersion="1.1.0-beta.19205.4"

while [[ $# > 0 ]]; do
opt="$(echo "$1" | awk '{print tolower($0)}')"
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"dotnet": "2.2.103"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19202.3",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19202.3",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19205.6",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19205.6",
"Microsoft.NET.Sdk.IL": "3.0.0-preview4-27527-73"
}
}