Skip to content

Commit 2784476

Browse files
author
John Luo
committed
Verification
1 parent e181253 commit 2784476

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

eng/Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
$(RepoRoot)src\Components\WebAssembly\WebAssembly.Authentication\src\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj;
137137
"
138138
Exclude="@(ProjectToExclude)" />
139-
<ProjectToExclude Condition=" '$(ArcadeBuildFromSource)' == 'true'" Include="@(YarnMSBuildProjects)" />
139+
<ProjectToExclude Condition=" '$(DotNetBuildFromSource)' == 'true'" Include="@(YarnMSBuildProjects)" />
140140

141141
<JavaProjects Include="$(RepoRoot)src\SignalR\**\*.javaproj"
142142
Exclude="@(ProjectToExclude)" />

eng/common/templates/steps/source-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ steps:
5252
**/*.log
5353
**/*.binlog
5454
artifacts/source-build/self/prebuilt-report/**
55+
artifacts/packages/Release/NonShipping/*
5556
TargetFolder: '$(Build.StagingDirectory)/BuildLogs'
5657
CleanTargetFolder: true
5758
continueOnError: true
Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From d070c95637ba2c26f51588088b9c1e76deed9623 Mon Sep 17 00:00:00 2001
1+
From d0c2069e7c81c5fbd5a27f786e5e3347ab9d4b95 Mon Sep 17 00:00:00 2001
22
From: John Luo <[email protected]>
3-
Date: Tue, 18 May 2021 16:08:50 -0700
4-
Subject: [PATCH] global.json updates for source-build
3+
Date: Wed, 19 May 2021 10:41:41 -0700
4+
Subject: [PATCH] global.json updates for source build
55

66
---
7-
global.json | 6 +-----
8-
1 file changed, 1 insertion(+), 5 deletions(-)
7+
global.json | 5 +----
8+
1 file changed, 1 insertion(+), 4 deletions(-)
99

1010
diff --git a/global.json b/global.json
11-
index 5a2b8a613d..43723053ce 100644
11+
index 5a2b8a613d..951a5f9fe3 100644
1212
--- a/global.json
1313
+++ b/global.json
1414
@@ -5,13 +5,10 @@
@@ -26,14 +26,6 @@ index 5a2b8a613d..43723053ce 100644
2626
"aspnetcore/x64": [
2727
"3.1.14"
2828
]
29-
@@ -29,7 +26,6 @@
30-
"xcopy-msbuild": "16.5.0-alpha"
31-
},
32-
"msbuild-sdks": {
33-
- "Yarn.MSBuild": "1.22.10",
34-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2",
35-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2"
36-
}
3729
--
3830
2.20.1.windows.1
3931

0 commit comments

Comments
 (0)