Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/aspnetcore.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Mitchell <mmitche@microsoft.com>2022-03-22 19:01:14 +0300
committerMatt Mitchell <mmitche@microsoft.com>2022-03-22 19:01:14 +0300
commitf9ae0f5d30be2de3c0de61b5673bd8873231d70a (patch)
tree9fb6168a39de4465d35a856935a37b373a8690a7
parentcdabbaa6ffb048ff964474b934f54bfde1cfc6ff (diff)
Merged PR 21931: Revert "[release/6.0] Build ProjectTemplates in Source-Build (#40650)" (#40805)v6.0.4
# {PR title} Summary of the changes (Less than 80 chars) ## Description {Detail} Fixes #{bug number} (in this specific format) ## Customer Impact {Justification} ## Regression? - [ ] Yes - [ ] No [If yes, specify the version the behavior has regressed from] ## Risk - [ ] High - [ ] Medium - [ ] Low [Justify the selection above] ## Verification - [ ] Manual (required) - [ ] Automated ## Packaging changes reviewed? - [ ] Yes - [ ] No - [ ] N/A ---- ## When servicing release/2.1 - [ ] Make necessary changes in eng/PatchConfig.props Revert "[release/6.0] Build ProjectTemplates in Source-Build (#40650)" (#40805) This reverts commit 7c2000d3444c2c0b1f4aaeb32800b0659c2d401d.
-rw-r--r--Directory.Build.props3
-rw-r--r--Directory.Build.targets9
2 files changed, 2 insertions, 10 deletions
diff --git a/Directory.Build.props b/Directory.Build.props
index 721f099a77..8f0ac59422 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -30,9 +30,6 @@
$(MSBuildProjectName.EndsWith('.Test')) OR
$(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true</IsUnitTestProject>
<IsTestAssetProject Condition=" $(RepoRelativeProjectDir.Contains('testassets')) OR $(MSBuildProjectName.Contains('TestCommon'))">true</IsTestAssetProject>
- <IsProjectTemplateProject Condition=" ($(RepoRelativeProjectDir.Contains('ProjectTemplates')) OR $(MSBuildProjectName.Contains('ProjectTemplates')) ) AND
- '$(IsUnitTestProject)' != 'true' AND
- '$(IsTestAssetProject)' != 'true' ">true</IsProjectTemplateProject>
<IsSampleProject Condition=" $(RepoRelativeProjectDir.ToUpperInvariant().Contains('SAMPLE')) ">true</IsSampleProject>
<IsAnalyzersProject Condition="$(MSBuildProjectName.EndsWith('.Analyzers'))">true</IsAnalyzersProject>
<IsShipping Condition=" '$(IsSampleProject)' == 'true' OR
diff --git a/Directory.Build.targets b/Directory.Build.targets
index fd388a1176..a195c0fb2e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,15 +1,10 @@
<Project>
<PropertyGroup>
- <!-- Only build Microsoft.AspNetCore.App, Microsoft.AspNetCore.App.Ref, ref/ assemblies, and ProjectTemplates in source build. -->
+ <!-- Only build Microsoft.AspNetCore.App, Microsoft.AspNetCore.App.Ref, and ref/ assemblies in source build. -->
<!-- Analyzer package are needed in source build for WebSDK -->
<ExcludeFromSourceBuild
- Condition="'$(ExcludeFromSourceBuild)' == '' and
- '$(DotNetBuildFromSource)' == 'true' and
- '$(IsAspNetCoreApp)' != 'true' and
- '$(MSBuildProjectName)' != '$(TargetingPackName)' and
- '$(IsAnalyzersProject)' != 'true' and
- '$(IsProjectTemplateProject)' != 'true'">true</ExcludeFromSourceBuild>
+ Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(MSBuildProjectName)' != '$(TargetingPackName)' and '$(IsAnalyzersProject)' != 'true'">true</ExcludeFromSourceBuild>
<!-- If the user has specified that they want to skip building any test related projects with SkipTestBuild,
suppress all targets for TestProjects using ExcludeFromBuild. -->