Skip to content

[main] Update dependencies from dotnet/arcade #2228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 34 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b48aab4
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 22, 2023
a09596e
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jun 26, 2023
51d055d
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 3, 2023
675543f
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 10, 2023
33b47d5
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 14, 2023
2b0aca3
Merge branch 'main' into darc-main-3a82dc2f-3a2a-4050-918c-186b02e8aba0
ViktorHofer Jul 14, 2023
3029442
Remove sourcelink entry and add validation
ViktorHofer Jul 14, 2023
7994169
Update global.json
ViktorHofer Jul 14, 2023
dafe185
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 11, 2023
eb2ef84
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 18, 2023
44cd89f
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Sep 25, 2023
6f64c56
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Oct 2, 2023
4c161f2
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 9, 2023
9d3d831
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 16, 2023
8e0236b
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 23, 2023
b5ebe63
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 27, 2023
f2b1f74
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 29, 2023
7fe1ea8
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 30, 2023
c9974c5
Update Versions.props
ViktorHofer Oct 31, 2023
38461e6
Update Version.Details.xml
ViktorHofer Oct 31, 2023
568a525
Update .vsts-ci.yml
ViktorHofer Oct 31, 2023
6d36073
Delete eng/Publishing.props
ViktorHofer Oct 31, 2023
e9f35dc
Merge branch 'main' into darc-main-3a82dc2f-3a2a-4050-918c-186b02e8aba0
ViktorHofer Oct 31, 2023
c5d7357
Update System.CommandLine.csproj
ViktorHofer Oct 31, 2023
cb0ce57
Update NuGet.config
ViktorHofer Nov 1, 2023
22a49cd
Update NativeAOT.csproj
ViktorHofer Nov 2, 2023
3999001
Update TypeExtensions.cs
ViktorHofer Nov 2, 2023
6ac17bb
Update TypeExtensions.cs
ViktorHofer Nov 2, 2023
a7fcf90
Disable NativeAOT test on macOS
ViktorHofer Nov 2, 2023
f5c5cad
Remove suppression of license task
ViktorHofer Nov 2, 2023
33d8733
Update CompilationTests.cs
ViktorHofer Nov 2, 2023
40f5e19
Update CompilationTests.cs
ViktorHofer Nov 2, 2023
7783ca0
Update CompilationTests.cs
ViktorHofer Nov 2, 2023
6c144d5
Update SourceBuildPrebuiltBaseline.xml
ViktorHofer Nov 2, 2023
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
3 changes: 0 additions & 3 deletions .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,3 @@ stages:

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: eng\common\templates\post-build\post-build.yml
parameters:
publishingInfraVersion: 3
enableSourceLinkValidation: false
5 changes: 0 additions & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,4 @@
<TargetFrameworkForNETSDK>net7.0</TargetFrameworkForNETSDK>
</PropertyGroup>

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

</Project>
3 changes: 1 addition & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<!-- required by NativeAOT -->
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
5 changes: 0 additions & 5 deletions eng/Publishing.props

This file was deleted.

4 changes: 4 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@
<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />

<!-- Picks this up from the SDK. This is allowed for the repo build and won't be an issue with full VMR
build because it will be retrieved from the N-1 artifacts. -->
<UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/8.*" />
</IgnorePatterns>
</UsageData>
16 changes: 5 additions & 11 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23052.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23528.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5a5ae41c42e475e280342b668e668ff34539e36d</Sha>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22518-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22631.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>ca611a68bb48cedf72a782d41622453cb2dab100</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23528.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bb2b4326ddf03d86c92bd125dba87e9d8df63463</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
20 changes: 3 additions & 17 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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. -->
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<Project>
<!-- Repo Version Information -->
<PropertyGroup>
<!-- Default version number to global tool. -->
<VersionPrefix>0.1.0</VersionPrefix>
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
<PreReleaseVersionLabel>
</PreReleaseVersionLabel>
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
<PublishWindowsPdb>true</PublishWindowsPdb>
</PropertyGroup>
<PropertyGroup Condition="'$(UseGlobalToolVersion)' == 'true'">
<AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
Expand All @@ -25,15 +22,4 @@
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
</PropertyGroup>
<PropertyGroup>
<UsingToolSourceLink>true</UsingToolSourceLink>
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
<PublishWindowsPdb>true</PublishWindowsPdb>
</PropertyGroup>
<!-- Package versions -->
<PropertyGroup>
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>9.0.0-alpha.1.23475.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesPackageVersion>
<MicrosoftSourceLinkGitHubVersion>1.2.0-beta-22518-02</MicrosoftSourceLinkGitHubVersion>
<MicrosoftDotNetXliffTasksVersion>1.0.0-beta.22631.1</MicrosoftDotNetXliffTasksVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) {
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
}

$dotnetVersions = @('5','6','7')
$dotnetVersions = @('5','6','7','8')

foreach ($dotnetVersion in $dotnetVersions) {
$feedPrefix = "dotnet" + $dotnetVersion;
Expand Down
2 changes: 1 addition & 1 deletion eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then
PackageSources+=('dotnet3.1-internal-transport')
fi

DotNetVersions=('5' '6' '7')
DotNetVersions=('5' '6' '7' '8')

for DotNetVersion in ${DotNetVersions[@]} ; do
FeedPrefix="dotnet${DotNetVersion}";
Expand Down
2 changes: 1 addition & 1 deletion eng/common/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ while [[ $# > 0 ]]; do
-binarylog|-bl)
binary_log=true
;;
-excludeCIBinarylog|-nobl)
-excludecibinarylog|-nobl)
exclude_ci_binary_log=true
;;
-pipelineslog|-pl)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/cross/arm/sources.list.xenial
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
2 changes: 1 addition & 1 deletion eng/common/cross/arm64/sources.list.xenial
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted

deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
Loading