-
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 all 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
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>$(NetMinimum)</TargetFramework> | ||
| <Description> | ||
| Entity Framework Core Tools for the .NET Command-Line Interface. | ||
|
|
||
|
|
@@ -13,18 +14,14 @@ | |
| dotnet ef database drop | ||
| dotnet ef database update | ||
| </Description> | ||
| <TargetFramework>$(NetMinimum)</TargetFramework> | ||
| <OutputType>Exe</OutputType> | ||
| <PackAsTool>true</PackAsTool> | ||
| <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;win-arm64</PackAsToolShimRuntimeIdentifiers> | ||
| <!-- Because this project uses a custom nuspec, this is necessary to ensure the generated shims are in the publish directory. --> | ||
| <PackagedShimOutputRootDirectory>$(OutDir)</PackagedShimOutputRootDirectory> | ||
| <RootNamespace>Microsoft.EntityFrameworkCore.Tools</RootNamespace> | ||
| <IncludeSource>false</IncludeSource> | ||
| <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile> | ||
| <RollForward>Major</RollForward> | ||
| <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\..\rulesets\EFCore.noxmldocs.ruleset</CodeAnalysisRuleSet> | ||
| <ImplicitUsings>true</ImplicitUsings> | ||
| <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddEfProjectOutput</TargetsForTfmSpecificContentInPackage> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
|
|
@@ -48,7 +45,7 @@ | |
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\ef\ef.csproj" ReferenceOutputAssembly="false" /> | ||
| <ProjectReference Include="..\ef\ef.csproj" ReferenceOutputAssembly="false" PrivateAssets="all" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
|
|
@@ -70,26 +67,17 @@ | |
| </Compile> | ||
| </ItemGroup> | ||
|
|
||
| <Target Name="SetPackageProperties" BeforeTargets="InitializeStandardNuspecProperties" DependsOnTargets="BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup"> | ||
| <PropertyGroup> | ||
| <!-- Make sure we create a symbols.nupkg. --> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- PDBs are currently always included as PackAsTool packages don't support excluding them. | ||
|
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. Yes, this is the reason why I had added the workaround to build the symbols package in the second pass
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. Not necessary to do anything here. This is the same as the latest released package on nuget.org. When the sdk issue will be adressed, efcore will automatically benefit. |
||
| https://github.com/dotnet/sdk/issues/53226 --> | ||
| <Target Name="AddEfProjectOutput"> | ||
| <ItemGroup> | ||
| <NuspecProperty Include="targetFramework=$(TargetFramework)" /> | ||
| <NuspecProperty Include="SettingsFile=$(_ToolsSettingsFilePath)" /> | ||
| <!-- https://github.com/dotnet/msbuild/issues/10715. %2A replaces * working around an issue building Linux. --> | ||
| <NuspecProperty Include="Output=$(PublishDir)%2A%2A/%2A" /> | ||
| <NuspecProperty Include="OutputBinary=..\..\artifacts\bin\ef\$(Configuration)\$(TargetFramework)\ef.dll" /> | ||
| <NuspecProperty Include="OutputRuntimeConfig=..\..\artifacts\bin\ef\$(Configuration)\$(TargetFramework)\ef.runtimeconfig.json" /> | ||
| <NuspecProperty Include="OutputSymbol=..\..\artifacts\bin\ef\$(Configuration)\$(TargetFramework)\ef.pdb" /> | ||
| <NuspecProperty Include="OutputExe=..\..\artifacts\bin\ef\$(Configuration)\net472\ef.exe" /> | ||
| <NuspecProperty Include="OutputExeSymbol=..\..\artifacts\bin\ef\$(Configuration)\net472\ef.pdb" /> | ||
| <NuspecProperty Include="OutputX86Exe=..\..\artifacts\bin\ef\x86\$(Configuration)\net472\ef.exe" /> | ||
| <NuspecProperty Include="OutputX86ExeSymbol=..\..\artifacts\bin\ef\x86\$(Configuration)\net472\ef.pdb" /> | ||
| <NuspecProperty Include="OutputARM64Exe=..\..\artifacts\bin\ef\ARM64\$(Configuration)\net472\ef.exe" /> | ||
| <NuspecProperty Include="OutputARM64ExeSymbol=..\..\artifacts\bin\ef\ARM64\$(Configuration)\net472\ef.pdb" /> | ||
| <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.dll" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any" /> | ||
| <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.runtimeconfig.json" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any" /> | ||
| <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/$(TargetFramework)/ef.pdb" PackagePath="tools/$(TargetFramework)/any/tools/$(TargetFramework)/any" /> | ||
| <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/$(Configuration)/net472/*" PackagePath="tools/$(TargetFramework)/any/tools/net472/any" /> | ||
| <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/x86/$(Configuration)/net472/*" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-x86" /> | ||
| <TfmSpecificPackageFile Include="$(ArtifactsBinDir)ef/ARM64/$(Configuration)/net472/*" PackagePath="tools/$(TargetFramework)/any/tools/net472/win-arm64" /> | ||
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| </Project> | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The 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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The 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.