mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Update dependencies from dotnet/arcade (#16982)

Browse source 
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 8.0.0-beta.23360.2 to 8.0.0-beta.23361.2 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23326.1 to 1.0.0-beta.23368.1 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147

 - Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147

 - Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147

 - Merge branch 'main' into darc-main-c2f7fa4c-9cb2-4989-838b-2a4e39afb147

 - Update sourcelink patch

 - Update sourcelink patch

 - Remove sourcelink dependencies - deployment-tools
This commit is contained in:
dotnet-maestro[bot] 2023-07-20 22:29:15 +00:00 • committed by GitHub
parent b1c1345289
commit 117cc25c04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -202,18 +202,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23369.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>9fba71ca242ef84c4b7696c380cc00efe734adb3</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23369.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>9fba71ca242ef84c4b7696c380cc00efe734adb3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23369.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>9fba71ca242ef84c4b7696c380cc00efe734adb3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23368.2">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -232,14 +232,14 @@
<Sha>529fbc2aad419d0c1551d6685cc68be33e62a996</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23360.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23361.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>a1eed1e0522f47f4fbf60ed5f8caef3679208d66</Sha>
<Sha>d2e046aec870a5a7601cc51c5607f34463cc2d42</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23326.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23368.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>10a822a79bde97ca45faa76dc4ec33b85533728a</Sha>
<Sha>3aa0b2b84cab7d94b9136547563d027fd78e82a6</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

2
eng/Versions.props
View file

@ -36,7 +36,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23369.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

2
eng/common/sdl/configure-sdl-tool.ps1
View file

@ -93,7 +93,7 @@ try {
}
'binskim' {
if ($targetDirectory) {
$tool.Args += "`"Target < $TargetDirectory`""
$tool.Args += "`"Target < $TargetDirectory\**`""
}
$tool.Args += $BinskimAdditionalRunConfigParams
}

6
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.100-preview.5.23303.2",
"dotnet": "8.0.100-preview.6.23330.14",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23361.1",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23361.1"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23369.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23369.2"
}
}

25
src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch Normal file
View file

@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Thu, 20 Jul 2023 21:02:57 +0000
Subject: [PATCH] Remove sourcelink dependencies
Backport: https://github.com/dotnet/deployment-tools/issues/282
---
eng/Tools.props | 6 ------
1 file changed, 6 deletions(-)
diff --git a/eng/Tools.props b/eng/Tools.props
index e0c3314..c0569e2 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -5,10 +5,4 @@
<_RepoToolManifest Condition="'$(ContinuousIntegrationBuild)' == 'true'" />
</PropertyGroup>
- <ItemGroup>
- <!-- enable source link in pkgproj -->
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
- <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(MicrosoftSourceLinkAzureReposGitVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
- </ItemGroup>
-
</Project>

6
src/SourceBuild/patches/sourcelink/0001-New-command-line-APIs.patch
View file

@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 17 Jul 2023 18:27:44 +0000
Date: Mon, 17 Jul 2023 15:10:02 +0000
Subject: [PATCH] New command-line APIs
Backport: https://github.com/dotnet/sourcelink/pull/1068
@ -26,7 +26,7 @@ index ed5441c..1873d27 100644
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
</packageSources>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0c3e675..fad95bd 100644
index 44c9e21..d86dff5 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,21 +1,21 @@
@ -58,7 +58,7 @@ index 0c3e675..fad95bd 100644
+ <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23356.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23360.2">
diff --git a/eng/Versions.props b/eng/Versions.props
index 994e10a..65ed6ee 100644
--- a/eng/Versions.props