Skip to content

Updating the None glob to include all tooling artifacts #12461

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
vijayrkn merged 2 commits into from
Jul 15, 2020
Merged

Updating the None glob to include all tooling artifacts #12461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
132519a
Moving the Well Known tooling properties to None glob
vijayrkn Jul 14, 2020
f9dc4cf
Fix the casing for the private property
vijayrkn Jul 15, 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
1 change: 1 addition & 0 deletions sdk.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{0C6854E8-01E
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{9446E46C-61A6-4DC0-975F-CF22B8A596A5}"
ProjectSection(SolutionItems) = preProject
src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.DefaultItems.props = src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.DefaultItems.props
src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.ProjectSystem.props = src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.ProjectSystem.props
src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.ProjectSystem.targets = src\WebSdk\ProjectSystem\Targets\Microsoft.NET.Sdk.Web.ProjectSystem.targets
EndProjectSection
Expand Down
44 changes: 44 additions & 0 deletions src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<!--
***********************************************************************************************
Microsoft.NET.Sdk.Web.DefaultItems.props

WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.

Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->
<Project ToolsVersion="14.0">

<ItemGroup Condition="'$(EnableDefaultItems)' == 'true'
And '$(EnableDefaultContentItems)' == 'true'
And '$(EnableDefaultNoneItems)' == 'true'
And '$(AppDesignerFolder)' != ''">
Comment thread
vijayrkn marked this conversation as resolved.

<_WebToolingArtifacts Include="$(AppDesignerFolder)\launchSettings.json;
$(AppDesignerFolder)\serviceDependencies.json;
$(AppDesignerFolder)\serviceDependencies.*.json;
$(AppDesignerFolder)\ServiceDependencies\**;
$(AppDesignerFolder)\PublishProfiles\**"
Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)"/>

<!-- Removing the tooling artifacts from all other globs and adding it to the none glob. This ensures that the
up-to-date check is unimpacted by the changes to the tooling artifacts -->
<None Remove="@(_WebToolingArtifacts)" />
<None Include="@(_WebToolingArtifacts)"
CopyToOutputDirectory="Never"
CopyToPublishDirectory="Never"
ExcludeFromSingleFile="true" />

<Content Remove="@(_WebToolingArtifacts)" />
<Compile Remove="@(_WebToolingArtifacts)" />
<EmbeddedResource Remove="@(_WebToolingArtifacts)" />

<!-- Keep track of the default content items for later to distinguish them from newly generated content items -->
<_ContentIncludedByDefault Remove="@(_ContentIncludedByDefault)" />
Comment thread
vijayrkn marked this conversation as resolved.
<_ContentIncludedByDefault Include="@(Content)" />

</ItemGroup>

</Project>
3 changes: 3 additions & 0 deletions src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,8 @@ Copyright (c) .NET Foundation. All rights reserved.
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props"
Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')"/>

<Import Project="$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Web.DefaultItems.props"
Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.NET.Sdk.Web.DefaultItems.props')"/>

</Project>

3 changes: 2 additions & 1 deletion src/WebSdk/Worker/Targets/Microsoft.NET.Sdk.Worker.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ Copyright (c) .NET Foundation. All rights reserved.

<!-- Keep track of the default content items for later to distinguish them from newly generated content items -->
<_ContentIncludedByDefault Include="@(Content)" />

</ItemGroup>

<Import Sdk="Microsoft.NET.Sdk.Web.ProjectSystem" Project="../Targets/Microsoft.NET.Sdk.Web.DefaultItems.props" />

</Project>