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

[main] Update dependencies from dotnet/sdk (#17118)

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Steve Pfister <steveisok@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2023-08-15 02:20:42 +00:00 • committed by GitHub
parent 95a65b11cd
commit 1c0b692a4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 127 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/SourceBuild/content/eng/Versions.props
View file

@ -30,7 +30,7 @@
These URLs can't be composed from their base URL and version as we read them from the
prep.sh and pipeline scripts, outside of MSBuild.
-->
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.7.23376.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.7.23376.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
<PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rc.1.23410.1.centos.8-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
<PrivateSourceBuiltSdkUrl_CentOS8Stream>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-rc.1.23410.1-centos.8-x64.tar.gz</PrivateSourceBuiltSdkUrl_CentOS8Stream>
</PropertyGroup>
</Project>

2
src/SourceBuild/content/global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "8.0.100-preview.7.23376.3"
"dotnet": "8.0.100-rc.1.23410.12"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",

3
src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs
View file

@ -34,7 +34,8 @@ public class BasicScenarioTests : SmokeTests
{
yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.Console,
// R2R is not supported on Mono (see https://github.com/dotnet/runtime/issues/88419#issuecomment-1623762676)
DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex | (helper.IsMonoRuntime ? DotNetActions.None : DotNetActions.PublishR2R));
// Disable R2R tests due to https://github.com/dotnet/source-build/issues/3591
DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex);
yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.ClassLib, DotNetActions.Build | DotNetActions.Publish);
yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.XUnit, DotNetActions.Test);
yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.NUnit, DotNetActions.Test);

25
src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch Normal file
View file

@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Fri, 11 Aug 2023 12:03:41 -0500
Subject: [PATCH] Disable trimmable for DotNet.Releases project
Backport: https://github.com/dotnet/deployment-tools/issues/288
---
.../src/Microsoft.Deployment.DotNet.Releases.csproj | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj b/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj
index ee19600..2e50a3a 100644
--- a/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj
+++ b/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj
@@ -5,8 +5,8 @@
<MinorVersion>0</MinorVersion>
<PreReleaseVersionIteration>6</PreReleaseVersionIteration>
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
- <IsTrimmable>true</IsTrimmable>
- <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+ <IsTrimmable>false</IsTrimmable>
+ <EnableTrimAnalyzer>false</EnableTrimAnalyzer>
</PropertyGroup>
<PropertyGroup>

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

@ -1,25 +0,0 @@
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>