Skip to content

Commit 436f973

Browse files
dotnet-maestro[bot]ViktorHofer
dotnet-maestro[bot]
and
ViktorHofer
authored
[main] Update dependencies from dotnet/arcade (#2228)
* Update dependencies from https://github.com/dotnet/arcade build 20230616.6 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 8.0.0-beta.23316.6 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-22518-02 -> To Version 8.0.0-beta.23314.2 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230622.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 8.0.0-beta.23322.2 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-22518-02 -> To Version 8.0.0-beta.23314.2 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230630.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 8.0.0-beta.23330.1 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-22518-02 -> To Version 8.0.0-beta.23328.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230710.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 8.0.0-beta.23360.1 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-22518-02 -> To Version 8.0.0-beta.23358.1 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/arcade build 20230713.3 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 8.0.0-beta.23363.3 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 1.2.0-beta-22518-02 -> To Version 8.0.0-beta.23361.2 (parent: Microsoft.DotNet.Arcade.Sdk * Remove sourcelink entry and add validation * Update global.json * Update dependencies from https://github.com/dotnet/arcade build 20230901.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 8.0.0-beta.23451.1 * Update dependencies from https://github.com/dotnet/arcade build 20230913.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 8.0.0-beta.23463.1 * Update dependencies from https://github.com/dotnet/arcade build 20230913.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 8.0.0-beta.23463.1 * Update dependencies from https://github.com/dotnet/arcade build 20230913.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 8.0.0-beta.23463.1 * Update dependencies from https://github.com/dotnet/arcade build 20231008.1 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 9.0.0-beta.23508.1 * Update dependencies from https://github.com/dotnet/arcade build 20231010.4 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 9.0.0-beta.23510.4 * Update dependencies from https://github.com/dotnet/arcade build 20231018.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 9.0.0-beta.23518.2 * Update dependencies from https://github.com/dotnet/arcade build 20231027.3 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 9.0.0-beta.23527.3 * Update dependencies from https://github.com/dotnet/arcade build 20231028.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 9.0.0-beta.23528.2 * Update dependencies from https://github.com/dotnet/arcade build 20231028.2 Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.23052.2 -> To Version 9.0.0-beta.23528.2 * Update Versions.props * Update Version.Details.xml * Update .vsts-ci.yml * Delete eng/Publishing.props * Update System.CommandLine.csproj * Update NuGet.config * Update NativeAOT.csproj * Update TypeExtensions.cs * Update TypeExtensions.cs * Disable NativeAOT test on macOS * Remove suppression of license task * Update CompilationTests.cs * Update CompilationTests.cs * Update CompilationTests.cs * Update SourceBuildPrebuiltBaseline.xml --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent d12a6ff commit 436f973

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+966
-276
lines changed

‎.vsts-ci.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,3 @@ stages:
172172

173173
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
174174
- template: eng\common\templates\post-build\post-build.yml
175-
parameters:
176-
publishingInfraVersion: 3
177-
enableSourceLinkValidation: false

‎Directory.Build.props‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,4 @@
1919
<TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
2020
</PropertyGroup>
2121

22-
<PropertyGroup>
23-
<!-- This repo is currently on the .NET 5 APIs, but a build task in license validation during source build requires 6.0. -->
24-
<SuppressLicenseValidation>true</SuppressLicenseValidation>
25-
</PropertyGroup>
26-
2722
</Project>

‎NuGet.config‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1010
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
1111
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
12-
<!-- required by NativeAOT -->
13-
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
12+
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
1413
</packageSources>
1514
<disabledPackageSources />
1615
</configuration>

‎eng/Publishing.props‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,9 @@
44
<UsageData>
55
<IgnorePatterns>
66
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />
7+
8+
<!-- Picks this up from the SDK. This is allowed for the repo build and won't be an issue with full VMR
9+
build because it will be retrieved from the N-1 artifacts. -->
10+
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/8.*" />
711
</IgnorePatterns>
812
</UsageData>

‎eng/Version.Details.xml‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,14 @@
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23052.2">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23528.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>5a5ae41c42e475e280342b668e668ff34539e36d</Sha>
13+
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22518-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
17-
<Uri>https://github.com/dotnet/sourcelink</Uri>
18-
<Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
19-
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
20-
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22631.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
22-
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
23-
<Sha>ca611a68bb48cedf72a782d41622453cb2dab100</Sha>
24-
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
16+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23528.2">
17+
<Uri>https://github.com/dotnet/arcade</Uri>
18+
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
2519
</Dependency>
2620
</ToolsetDependencies>
2721
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
3-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4-
<PropertyGroup>
5-
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
6-
</PropertyGroup>
1+
<Project>
72
<!-- Repo Version Information -->
83
<PropertyGroup>
94
<!-- Default version number to global tool. -->
105
<VersionPrefix>0.1.0</VersionPrefix>
116
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
127
<PreReleaseVersionLabel>
138
</PreReleaseVersionLabel>
9+
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
10+
<PublishWindowsPdb>true</PublishWindowsPdb>
1411
</PropertyGroup>
1512
<PropertyGroup Condition="'$(UseGlobalToolVersion)' == 'true'">
1613
<AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
@@ -25,15 +22,4 @@
2522
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
2623
<AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
2724
</PropertyGroup>
28-
<PropertyGroup>
29-
<UsingToolSourceLink>true</UsingToolSourceLink>
30-
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
31-
<PublishWindowsPdb>true</PublishWindowsPdb>
32-
</PropertyGroup>
33-
<!-- Package versions -->
34-
<PropertyGroup>
35-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>9.0.0-alpha.1.23475.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
36-
<MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22518-02</MicrosoftSourceLinkGitHubVersion>
37-
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22631.1</MicrosoftDotNetXliffTasksVersion>
38-
</PropertyGroup>
3925
</Project>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) {
153153
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
154154
}
155155

156-
$dotnetVersions = @('5','6','7')
156+
$dotnetVersions = @('5','6','7','8')
157157

158158
foreach ($dotnetVersion in $dotnetVersions) {
159159
$feedPrefix = "dotnet" + $dotnetVersion;

‎eng/common/SetupNugetSources.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then
105105
PackageSources+=('dotnet3.1-internal-transport')
106106
fi
107107

108-
DotNetVersions=('5' '6' '7')
108+
DotNetVersions=('5' '6' '7' '8')
109109

110110
for DotNetVersion in ${DotNetVersions[@]} ; do
111111
FeedPrefix="dotnet${DotNetVersion}";

‎eng/common/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
105105
-binarylog|-bl)
106106
binary_log=true
107107
;;
108-
-excludeCIBinarylog|-nobl)
108+
-excludecibinarylog|-nobl)
109109
exclude_ci_binary_log=true
110110
;;
111111
-pipelineslog|-pl)

0 commit comments

Comments
 (0)