Skip to content

Update to latest SBRP version with System.Text.Json updates #1777

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.

Sign up for GitHub

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 3 commits into from
Sep 29, 2020
Merged

Update to latest SBRP version with System.Text.Json updates #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a57c88c
Update to latest SBRP version with System.Text.Json updates
dseefeld Sep 28, 2020
aba60da
Update patch message and rename patch file
dseefeld Sep 28, 2020
30e1c73
Add back renamed patch file
dseefeld Sep 28, 2020
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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>
<!-- Production Dependencies -->
<PropertyGroup>
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.10000.2</PrivateSourceBuildReferencePackagesPackageVersion>
<PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20476.1</PrivateSourceBuildReferencePackagesPackageVersion>
<PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.100-bootstrap.9</PrivateSourceBuiltArtifactsPackageVersion>
</PropertyGroup>
</Project>
45 changes: 45 additions & 0 deletions patches/arcade/0014-Update-TFM-for-SharedFramework.Sdk-to-eliminate-depe.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
From cb70abf59465a8071b1a91bed30eff49e414b1d0 Mon Sep 17 00:00:00 2001
From: dseefeld <[email protected]>
Date: Mon, 28 Sep 2020 11:51:06 -0400
Subject: [PATCH] Update TFM for SharedFramework.Sdk to eliminate dependency

Update TFM for SharedFramework.Sdk to eliminate dependence on
Microsoft.Bcl.AsyncInterfaces.1.*. This package is not produced by the
runtime in preview8, but looks like it was added back in RC1 with
https://github.com/dotnet/runtime/pull/40189, so this should be a
temporary patch.

---
.../Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj | 2 +-
.../sdk/Sdk.props | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj
index 6644307c..9b8606b8 100644
--- a/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj
@@ -1,7 +1,7 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+ <TargetFrameworks>net5.0</TargetFrameworks>
<LangVersion>preview</LangVersion>
<ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>

diff --git a/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/sdk/Sdk.props
index 74b10617..c6e84e37 100644
--- a/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/sdk/Sdk.props
+++ b/src/Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk/sdk/Sdk.props
@@ -8,7 +8,7 @@
-->

<PropertyGroup Condition="'$(DotNetBuildTasksSharedFrameworkTaskDir)' == ''">
- <DotNetBuildTasksSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)../tools/netcoreapp2.1/</DotNetBuildTasksSharedFrameworkTaskDir>
+ <DotNetBuildTasksSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)../tools/net5.0/</DotNetBuildTasksSharedFrameworkTaskDir>
<DotNetBuildTasksSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' != 'core'">$(MSBuildThisFileDirectory)../tools/net472/</DotNetBuildTasksSharedFrameworkTaskDir>
</PropertyGroup>

--
2.18.2