Skip to content

Disable DependentUpon convention for EntityFramework.csproj #1312

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

Closed
rainersigwald wants to merge 7 commits into from
Closed

Disable DependentUpon convention for EntityFramework.csproj #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46facb1
Switch to embedded PackageIcon
wtgodbe Sep 23, 2019
0af9434
Add icon metadata to manually generated .nuspecs
wtgodbe Sep 24, 2019
7c3596d
Update to GA SDK
wtgodbe Sep 24, 2019
70db72c
Fix build errors
wtgodbe Sep 25, 2019
7ab4b74
Merge branch 'release/6.3' into Embedded63
wtgodbe Sep 25, 2019
8ca145a
Disable DependentUpon convention for EntityFramework.csproj
rainersigwald Sep 27, 2019
d41aa34
Other project too
rainersigwald Sep 27, 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
9 changes: 7 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@
<PropertyGroup>
<PackageTags>Microsoft;EntityFramework;EF;Database;Data;O/RM;ADO.NET</PackageTags>
<Product>Microsoft Entity Framework</Product>
<PackageLicenseUrl Condition="'$(PackageLicenseExpression)' == ''">http://go.microsoft.com/fwlink/?LinkID=262998</PackageLicenseUrl>
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=386613</PackageIconUrl>
<PackageIcon>packageIcon.png</PackageIcon>
<PackageIconFullPath>$(MSBuildThisFileDirectory)packageIcon.png</PackageIconFullPath>
<PackageProjectUrl>http://go.microsoft.com/fwlink/?LinkID=263480</PackageProjectUrl>
<DebugType>portable</DebugType>
</PropertyGroup>

<ItemGroup>
<None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"tools": {
"dotnet": "3.0.100-preview8-013656",
"dotnet": "3.0.100",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRuntimeVersion)"
]
}
},
"sdk": {
"version": "3.0.100-preview8-013656"
"version": "3.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7"
Expand Down
Binary file added packageIcon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<NuspecProperty Include="Configuration=$(Configuration)" />
<NuSpecProperty Include="MicrosoftSqlServerCompactVersion=$(MicrosoftSqlServerCompactVersion)" />
<NuspecProperty Include="NeutralLanguage=$(NeutralLanguage)" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions src/EntityFramework.SqlServerCompact/EntityFramework.SqlServerCompact.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,19 @@
<dependency id="EntityFramework" version="$Version$" exclude="Build,Analyzers" />
<dependency id="Microsoft.SqlServer.Compact" version="$MicrosoftSqlServerCompactVersion$" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETFramework4.5">
<dependency id="EntityFramework" version="$Version$" exclude="Build,Analyzers" />
<dependency id="Microsoft.SqlServer.Compact" version="$MicrosoftSqlServerCompactVersion$" exclude="Build,Analyzers" />
</group>
</dependencies>
<icon>packageIcon.png</icon>
</metadata>
<files>
<file src="../../artifacts/bin/EntityFramework.SqlServerCompact/$Configuration$/net40/EntityFramework.SqlServerCompact.dll" target="lib/net40/" />
<file src="../../artifacts/bin/EntityFramework.SqlServerCompact/$Configuration$/net40/EntityFramework.SqlServerCompact.xml" target="lib/net40/" />
<file src="../../artifacts/bin/EntityFramework.SqlServerCompact/$Configuration$/net45/EntityFramework.SqlServerCompact.dll" target="lib/net45/" />
<file src="../../artifacts/bin/EntityFramework.SqlServerCompact/$Configuration$/net45/EntityFramework.SqlServerCompact.xml" target="lib/net45/" />
<file src="content\**\*" target="content/" />
<file src="$PackageIcon$" target="" />
</files>
</package>
3 changes: 3 additions & 0 deletions src/EntityFramework/EntityFramework.InternalsVisibleTo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<RootNamespace>System.Data.Entity</RootNamespace>
<TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
<AssemblyVersion>6.0.0.0</AssemblyVersion>

<!-- Properties\Resources.tt expects a path that does not match the class in Properties\Resources.cs -->
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
3 changes: 3 additions & 0 deletions src/EntityFramework/EntityFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<Description>EntityFramework.dll</Description>
<AssemblyVersion>6.0.0.0</AssemblyVersion>
<DefineConstants>$(DefineConstants);INTERNALS_INVISIBLE</DefineConstants>

<!-- Properties\Resources.tt expects a path that does not match the class in Properties\Resources.cs -->
Copy link
Contributor

@nguerrera nguerrera Sep 27, 2019

Choose a reason for hiding this comment

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

Is it worth changing the code to use the conventional name?

Copy link
Member Author

@rainersigwald rainersigwald Sep 27, 2019

Choose a reason for hiding this comment

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

This is a great question I leave up to the maintainers. It didn't seem trivial, but I don't know the history of the Resources.tt approach or the details of its implementation.

<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
3 changes: 2 additions & 1 deletion src/NuGet/EntityFramework.CodeTemplates.CSharp/EntityFramework.CodeTemplates.CSharp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<id>EntityFramework.CodeTemplates.CSharp</id>
<version>$NuGetPackageVersion$</version>
<title>EntityFramework.CodeTemplates.CSharp</title>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=386613</iconUrl>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<tags>Microsoft EF EntityFramework</tags>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=$ProjectUrlFwLinkID$</projectUrl>
<licenseUrl>http://go.microsoft.com/fwlink/?LinkID=$LicenseUrlFwLinkID$</licenseUrl>
<icon>packageIcon.png</icon>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Adds the templates that EF uses to generate Code First models from a database so that code generation can be customized.</description>
<summary>Adds the templates that EF uses to generate Code First models from a database so that code generation can be customized.</summary>
Expand All @@ -18,5 +18,6 @@
<files>
<file src="Content\net40\CodeTemplates\EFModelFromDatabase\Context.cs.t4" target="Content\net40\CodeTemplates\EFModelFromDatabase" />
<file src="Content\net40\CodeTemplates\EFModelFromDatabase\EntityType.cs.t4" target="Content\net40\CodeTemplates\EFModelFromDatabase" />
<file src="$PackageIcon$" target="" />
</files>
</package>
3 changes: 2 additions & 1 deletion ...ntityFramework.CodeTemplates.VisualBasic/EntityFramework.CodeTemplates.VisualBasic.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<id>EntityFramework.CodeTemplates.VisualBasic</id>
<version>$NuGetPackageVersion$</version>
<title>EntityFramework.CodeTemplates.VisualBasic</title>
<iconUrl>http://go.microsoft.com/fwlink/?LinkID=386613</iconUrl>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<tags>Microsoft EF EntityFramework</tags>
<projectUrl>http://go.microsoft.com/fwlink/?LinkID=$ProjectUrlFwLinkID$</projectUrl>
<licenseUrl>http://go.microsoft.com/fwlink/?LinkID=$LicenseUrlFwLinkID$</licenseUrl>
<icon>packageIcon.png</icon>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<description>Adds the templates that EF uses to generate Code First models from a database so that code generation can be customized.</description>
<summary>Adds the templates that EF uses to generate Code First models from a database so that code generation can be customized.</summary>
Expand All @@ -18,5 +18,6 @@
<files>
<file src="Content\net40\CodeTemplates\EFModelFromDatabase\Context.vb.t4" target="Content\net40\CodeTemplates\EFModelFromDatabase" />
<file src="Content\net40\CodeTemplates\EFModelFromDatabase\EntityType.vb.t4" target="Content\net40\CodeTemplates\EFModelFromDatabase" />
<file src="$PackageIcon$" target="" />
</files>
</package>
1 change: 1 addition & 0 deletions src/NuGet/EntityFramework/EntityFramework.NuGet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<NuspecProperty Include="SystemConfigurationConfigurationManagerVersion=$(SystemConfigurationConfigurationManagerVersion)" />
<NuspecProperty Include="SystemDataSqlClientVersion=$(SystemDataSqlClientVersion)" />
<NuspecProperty Include="IntermediateOutputPath=$(IntermediateOutputPath)" />
<NuspecProperty Include="PackageIcon=$(PackageIconFullPath)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
Expand Down
2 changes: 2 additions & 0 deletions src/NuGet/EntityFramework/EntityFramework.NuGet.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<dependency id="System.Data.SqlClient" version="$SystemDataSqlClientVersion$" exclude="Build,Analyzers" />
</group>
</dependencies>
<icon>packageIcon.png</icon>
</metadata>
<files>
<file src="$IntermediateOutputPath$EntityFramework6.psd1" target="tools/"/>
Expand Down Expand Up @@ -49,5 +50,6 @@
<file src="buildTransitive\**\*" target="buildTransitive/" />
<file src="content\**\*" target="content/" />
<file src="tools\**\*" target="tools/" />
<file src="$PackageIcon$" target="" />
</files>
</package>
3 changes: 3 additions & 0 deletions src/ef6/ef6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.0;net40;net45</TargetFrameworks>
<RootNamespace>System.Data.Entity.Tools</RootNamespace>

<!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
3 changes: 3 additions & 0 deletions test/EntityFramework/FunctionalTests/FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<TargetFrameworks>net452;netcoreapp3.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);EF_FUNCTIONALS</DefineConstants>
<NoWarn>$(NoWarn);CS0169</NoWarn>

<!-- Work around https://github.com/microsoft/msbuild/issues/4740 -->
<EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net452'">
Expand Down