Skip to content

Commit

Permalink
Upgrade SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
crummel committed Sep 19, 2019
1 parent 5e92fb8 commit 50cdc24
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 137 deletions.
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "3.0.100-preview7-012821"
"dotnet": "3.0.100-preview8-013656"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From 639c8705e8c783f6d980fa0fad1d996b750bba74 Mon Sep 17 00:00:00 2001
From 94291517876d0cfb57eeb5bd34f8f26d8ef43ffe Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Wed, 18 Sep 2019 17:30:09 -0500
Subject: [PATCH 3/3] Build CoreFxTesting in source-build
Date: Wed, 18 Sep 2019 21:50:06 -0500
Subject: [PATCH 2/2] Build CoreFxTesting

---
.../Microsoft.DotNet.CoreFxTesting.csproj | 1 -
1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
index 33e90e49..694e3381 100644
index 78d8c94c..8bd6963a 100644
--- a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
+++ b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
@@ -5,7 +5,6 @@
<TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp2.1</TargetFrameworks>
@@ -4,7 +4,6 @@
<TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
<Description>This package provides support for running tests inside CoreFx.</Description>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
Expand Down

This file was deleted.

0 comments on commit 50cdc24

Please sign in to comment.