Skip to content
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

Jump to bottom

Remove unnecessary placeholders in .nuspec's #18214

Merged
merged 2 commits into from
Oct 10, 2019
Merged

Remove unnecessary placeholders in .nuspec's #18214

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
076caaf
Fix placeholder file locations to match nuspecs
wtgodbe Oct 3, 2019
9fe9666
Remove unneeded placeholder files
wtgodbe Oct 3, 2019
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: 0 additions & 2 deletions src/EFCore.Analyzers/EFCore.Analyzers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<IncludeBuildOutput>false</IncludeBuildOutput>
<CodeAnalysisRuleSet>..\..\EFCore.ruleset</CodeAnalysisRuleSet>
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
<NetStandard13PlaceholderFile>$(MSBuildThisFileDirectory)lib\netstandard1.3\_._</NetStandard13PlaceholderFile>
</PropertyGroup>

<ItemGroup>
Expand All @@ -31,7 +30,6 @@
<NuspecProperty Include="OutputBinary=$(OutputPath)$(AssemblyName).dll" />
<NuspecProperty Include="OutputSymbol=$(OutputPath)$(AssemblyName).pdb" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
<NuspecProperty Include="NetStandard13PlaceholderFile=$(NetStandard13PlaceholderFile)" />
</ItemGroup>
</Target>

Expand Down
1 change: 0 additions & 1 deletion src/EFCore.Analyzers/EFCore.Analyzers.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@
<file src="$OutputBinary$" target="analyzers\dotnet\cs\" />
<file src="$OutputSymbol$" target="analyzers\dotnet\cs\" />
<file src="$PackageIcon$" target="" />
<file src="$NetStandard13PlaceholderFile$" target="lib\netstandard1.3" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's hard to tell in GitHub. Are you deleting the _._ files?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

</files>
</package>
Empty file removed src/EFCore.Analyzers/lib/netstandard1.3/_._
View file
Open in desktop
Empty file.
2 changes: 0 additions & 2 deletions src/dotnet-ef/dotnet-ef.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ dotnet ef database update
which maximizes the machines on which this tool will be compatible.
-->
<TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' ">false</TargetLatestDotNetRuntime>
<NetCoreApp21PlaceholderFile>$(MSBuildThisFileDirectory)lib\netcoreapp2.1\_._</NetCoreApp21PlaceholderFile>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -98,7 +97,6 @@ dotnet ef database update
<NuspecProperty Include="OutputX86Exe=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.exe" />
<NuspecProperty Include="OutputX86ExeSymbol=..\..\artifacts\bin\ef\x86\$(Configuration)\net461\ef.pdb" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
<NuspecProperty Include="NetCoreApp21PlaceholderFile=$(NetCoreApp21PlaceholderFile)" />
</ItemGroup>
</Target>
</Project>
1 change: 0 additions & 1 deletion src/dotnet-ef/dotnet-ef.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
<file src="$OutputX86Exe$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
<file src="$OutputX86ExeSymbol$" target="tools\$targetFramework$\any\tools\net461\win-x86" />
<file src="$PackageIcon$" target="" />
<file src="$NetCoreApp21PlaceholderFile$" target="lib\netcoreapp2.1" />
</files>
</package>
Empty file removed src/dotnet-ef/lib/netcoreapp2.1/_._
View file
Open in desktop
Empty file.