-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Remove checked-in nuspec files to resolve build issues #37826
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.
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
Changes from 12 commits
ba19496
36dcbdb
c01eba6
ccbce7a
b22182a
08c59e3
a1ba6f4
a30459c
837e44c
366d4fb
52d43d7
b89d49d
da71ac5
13cd225
236ac43
fc86041
c629829
4727cb0
ead25ac
824aca1
13b350d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <Project> | ||
|
|
||
| <!-- | ||
| Creates a symbols package (.symbols.nupkg) containing PDB files by running a second Pack | ||
| with _IsSymbolsPack=true. Projects that import this file should: | ||
| 1. Set IncludeSymbols=false | ||
| 2. Include PDB files unconditionally in _PackageFiles | ||
| 3. Add an ExcludePdbFiles target that strips all .pdb files when _IsSymbolsPack!=true | ||
| --> | ||
|
|
||
| <Target Name="CreateSymbolsPackage" AfterTargets="Pack" | ||
| Condition="'$(_IsSymbolsPack)' != 'true' and '$(IsPackable)' != 'false'"> | ||
| <PropertyGroup> | ||
| <_SymbolsPackTempDir>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'symbolspkg'))</_SymbolsPackTempDir> | ||
| </PropertyGroup> | ||
| <MakeDir Directories="$(_SymbolsPackTempDir)" /> | ||
| <MSBuild Projects="$(MSBuildProjectFullPath)" | ||
| Targets="Pack" | ||
| Properties="_IsSymbolsPack=true;PackageOutputPath=$(_SymbolsPackTempDir)" /> | ||
| <Copy SourceFiles="$(_SymbolsPackTempDir)$(PackageId).$(PackageVersion).nupkg" | ||
| DestinationFiles="$(PackageOutputAbsolutePath)$(PackageId).$(PackageVersion).symbols.nupkg" | ||
| OverwriteReadOnlyFiles="true" /> | ||
| <RemoveDir Directories="$(_SymbolsPackTempDir)" ContinueOnError="true" /> | ||
| </Target> | ||
|
|
||
| </Project> |
This file was deleted.
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a change to the current package on nuget.org. Why adding a placeholder file?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For same reason as the .Tools package. But this is also likely going to be removed. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,14 +5,13 @@ | |
| <PropertyGroup> | ||
| <TargetFramework>$(NetMinimum)</TargetFramework> | ||
| <PackageId>Microsoft.EntityFrameworkCore.Tools</PackageId> | ||
| <NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile> | ||
| <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> | ||
| <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking> | ||
| <NoPackageAnalysis>true</NoPackageAnalysis> | ||
| <DevelopmentDependency>true</DevelopmentDependency> | ||
| <IncludeBuildOutput>false</IncludeBuildOutput> | ||
| <IncludeSource>false</IncludeSource> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <!-- Symbols package is created separately by eng/CreateSymbolsPackage.targets --> | ||
| <IncludeSymbols>false</IncludeSymbols> | ||
| <Description>Entity Framework Core Tools for the NuGet Package Manager Console in Visual Studio. | ||
|
|
||
| Enables these commonly used commands: | ||
|
|
@@ -31,28 +30,46 @@ Update-Database | |
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\ef\ef.csproj" ReferenceOutputAssembly="false" /> | ||
| <ProjectReference Include="..\ef\ef.csproj" ReferenceOutputAssembly="false" PrivateAssets="all" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" PrivateAssets="All" /> | ||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Design" VersionOverride="8.0.0" /> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @AndriySvyryd this change is questionable. What's the intent? Why 8.0.0?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. See my last commit. I added a stub project that makes referencing the live EFCore.Design work from this project, even though it targets net10.0. This is a hack though. I'm not sure why this design was chosen in the first place.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The tools need to work with older versions of EF and 8.0.0 is currently the oldest supported version. Referencing the live one will break support for net8.0 apps, see #37515 (comment) However, I do realize this is brittle anyway, so #37739 tracks removing it and forcing the user to add this dependency themselves, I just wanted to do it in a separate PR to allow this to be checked in quicker. |
||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <GeneratedContent Include="*.psd1.in" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- | ||
| Workaround for insufficient support for tools packages by NuGet Pack: https://github.com/NuGet/Home/issues/6321. | ||
| --> | ||
| <Target Name="SetPackageProperties" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="Build"> | ||
| <Target Name="AddPackContent" BeforeTargets="GenerateNuspec" DependsOnTargets="GenerateContent"> | ||
| <ItemGroup> | ||
| <NuspecProperty Include="configuration=$(Configuration)" /> | ||
| <NuspecProperty Include="intermediateOutputPath=$(IntermediateOutputPath)" /> | ||
| <NuspecProperty Include="targetFramework=$(TargetFramework)" /> | ||
| <_PackageFiles Include="lib/**/*" PackagePath="lib/" /> | ||
| <_PackageFiles Include="tools/**/*" PackagePath="tools/" /> | ||
| <_PackageFiles Include="$(IntermediateOutputPath)*.psd1" PackagePath="tools/" /> | ||
| <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.exe" PackagePath="tools/net472/any/" /> | ||
| <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/ef.pdb" PackagePath="tools/net472/any/" /> | ||
| <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.exe" PackagePath="tools/net472/win-x86/" /> | ||
| <_PackageFiles Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/ef.pdb" PackagePath="tools/net472/win-x86/" /> | ||
| <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.exe" PackagePath="tools/net472/win-arm64/" /> | ||
| <_PackageFiles Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/ef.pdb" PackagePath="tools/net472/win-arm64/" /> | ||
| <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.dll" PackagePath="tools/$(TargetFramework)/any/" /> | ||
| <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.pdb" PackagePath="tools/$(TargetFramework)/any/" /> | ||
| <_PackageFiles Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.runtimeconfig.json" PackagePath="tools/$(TargetFramework)/any/" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <!-- Strip all PDB files from the main package; they are included in the symbols package --> | ||
| <Target Name="ExcludePdbFiles" BeforeTargets="GenerateNuspec" | ||
| DependsOnTargets="AddPackContent" | ||
| Condition="'$(_IsSymbolsPack)' != 'true'"> | ||
| <ItemGroup> | ||
| <_PackageFiles Remove="@(_PackageFiles)" Condition="'%(Extension)' == '.pdb'" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <Import Project="..\..\eng\CreateSymbolsPackage.targets" /> | ||
|
|
||
| <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> | ||
|
|
||
| <Target Name="GenerateContent" | ||
|
|
||
This file was deleted.
Uh oh!
There was an error while loading. Please reload this page.