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

[main] Update dependencies from dotnet/source-build-reference-packages (#16169)

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2023-04-20 12:16:27 -05:00 committed by GitHub
parent 2fdfcbe35a
commit c7bb987f70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -218,9 +218,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>af841c8b33cecc92d74222298f1e45bf7bf3d90a</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23218.5">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23220.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>252170d24e1c667b627b0d1328a5cdbc8e038fa2</Sha>
<Sha>c73065ba502e1982f4ae743ebd0fc6bb8cf06690</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

27
src/SourceBuild/patches/vstest/0001-Remove-explicit-framework-ref-assembly-ref.patch Normal file
View file

@ -0,0 +1,27 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 19 Apr 2023 09:30:15 -0700
Subject: [PATCH] Remove explicit framework ref assembly ref The SDK brings
this implicitly when targeting a net4* TFM
Backport: https://github.com/microsoft/vstest/pull/4407
---
Directory.Build.targets | 5 -----
1 file changed, 5 deletions(-)
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 5077c4638..b720568ba 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -11,11 +11,6 @@
<TargetFramework Condition=" '$(TargetFramework)' != '' ">$(NetCurrent)</TargetFramework>
</PropertyGroup>
- <!-- Allows build of .NET Framework assemblies on MacOS and Linux https://github.com/dotnet/designs/pull/33#issuecomment-489264196 -->
- <ItemGroup>
- <PackageReference Condition=" '$(OS)' != 'Windows_NT' " Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
- </ItemGroup>
-
<!-- Test project settings -->
<Choose>
<When Condition="$(TestProject) == 'true'">