Skip to content

Commit

Permalink
set GenerateResourceUsePreserializedResources only for projects that …
Browse files Browse the repository at this point in the history
…actually need it instead of a global props
  • Loading branch information
Barsonax committed Jun 24, 2020
1 parent abe9e13 commit 153bd7f
Show file tree
Hide file tree
Showing 12 changed files with 582 additions and 564 deletions.
1 change: 0 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<NoWarn>1701;1702;CS1591;CS0419</NoWarn>
<DefaultItemExcludes>$(DefaultItemExcludes);Content\**</DefaultItemExcludes>
<RootFolder>$(MSBuildThisFileDirectory)</RootFolder>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
Expand Down
1 change: 1 addition & 0 deletions Source/Editor/DualityEditor/DualityEditor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<ApplicationIcon>DualityLogoIcon.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
<EmbeddedResourceUseDependentUponConvention>true</EmbeddedResourceUseDependentUponConvention>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>

<ItemGroup>
Expand Down
130 changes: 66 additions & 64 deletions Source/Plugins/EditorBase/EditorBase.Editor.csproj
Original file line number Diff line number Diff line change
@@ -1,74 +1,76 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>4.0.0-alpha3</Version>
<Copyright>Copyright © Duality Core Team 2020</Copyright>
<RootNamespace>Duality.Editor.Plugins.Base</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<EmbeddedResourceUseDependentUponConvention>true</EmbeddedResourceUseDependentUponConvention>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>4.0.0-alpha3</Version>
<Copyright>Copyright © Duality Core Team 2020</Copyright>
<RootNamespace>Duality.Editor.Plugins.Base</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<EmbeddedResourceUseDependentUponConvention>true</EmbeddedResourceUseDependentUponConvention>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AdamsLair.DockPanelSuite">
<Version>2.8.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.WinForms">
<Version>1.1.17</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="AdamsLair.DockPanelSuite">
<Version>2.8.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.WinForms">
<Version>1.1.17</Version>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Editor\DualityEditor\DualityEditor.csproj">
<Project>{9FB9F397-FD39-460C-A9AD-B4780D19945F}</Project>
<Name>DualityEditor</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Core\Primitives\DualityPrimitives.csproj">
<Project>{c87a6a2f-e537-48fa-a789-3c54cf29cc09}</Project>
<Name>DualityPrimitives</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Core\Duality\Duality.csproj">
<Project>{D821AFB9-BCC9-4025-9A9C-798E2BC546AB}</Project>
<Name>Duality</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Editor\DualityEditor\DualityEditor.csproj">
<Project>{9FB9F397-FD39-460C-A9AD-B4780D19945F}</Project>
<Name>DualityEditor</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Core\Primitives\DualityPrimitives.csproj">
<Project>{c87a6a2f-e537-48fa-a789-3c54cf29cc09}</Project>
<Name>DualityPrimitives</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Core\Duality\Duality.csproj">
<Project>{D821AFB9-BCC9-4025-9A9C-798E2BC546AB}</Project>
<Name>Duality</Name>
<Private>False</Private>
</ProjectReference>
<PackageReference Include="System.Resources.Extensions" Version="4.6.0" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>

<EmbeddedResource Update="Properties\EditorBaseRes.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>EditorBaseRes.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Update="Properties\EditorBaseRes.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>EditorBaseRes.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
</ItemGroup>
<EmbeddedResource Update="Properties\EditorBaseRes.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>EditorBaseRes.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Update="Properties\EditorBaseRes.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>EditorBaseRes.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
</ItemGroup>

<ItemGroup>
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Windows.Forms" />
</ItemGroup>

<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).xml" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
</Target>
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).xml" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
</Target>

</Project>
130 changes: 66 additions & 64 deletions Source/Plugins/EditorModules/CamView/CamView.Editor.csproj
Original file line number Diff line number Diff line change
@@ -1,74 +1,76 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>4.0.0-alpha3</Version>
<Copyright>Copyright © Duality Core Team 2020</Copyright>
<RootNamespace>Duality.Editor.Plugins.CamView</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<EmbeddedResourceUseDependentUponConvention>true</EmbeddedResourceUseDependentUponConvention>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>4.0.0-alpha3</Version>
<Copyright>Copyright © Duality Core Team 2020</Copyright>
<RootNamespace>Duality.Editor.Plugins.CamView</RootNamespace>
<UseWindowsForms>true</UseWindowsForms>
<EmbeddedResourceUseDependentUponConvention>true</EmbeddedResourceUseDependentUponConvention>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AdamsLair.DockPanelSuite">
<Version>2.8.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.WinForms">
<Version>1.1.17</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="AdamsLair.DockPanelSuite">
<Version>2.8.2</Version>
</PackageReference>
<PackageReference Include="AdamsLair.WinForms">
<Version>1.1.17</Version>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Editor\DualityEditor\DualityEditor.csproj">
<Project>{9FB9F397-FD39-460C-A9AD-B4780D19945F}</Project>
<Name>DualityEditor</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Core\Primitives\DualityPrimitives.csproj">
<Project>{c87a6a2f-e537-48fa-a789-3c54cf29cc09}</Project>
<Name>DualityPrimitives</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Core\Duality\Duality.csproj">
<Project>{D821AFB9-BCC9-4025-9A9C-798E2BC546AB}</Project>
<Name>Duality</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Editor\DualityEditor\DualityEditor.csproj">
<Project>{9FB9F397-FD39-460C-A9AD-B4780D19945F}</Project>
<Name>DualityEditor</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Core\Primitives\DualityPrimitives.csproj">
<Project>{c87a6a2f-e537-48fa-a789-3c54cf29cc09}</Project>
<Name>DualityPrimitives</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Core\Duality\Duality.csproj">
<Project>{D821AFB9-BCC9-4025-9A9C-798E2BC546AB}</Project>
<Name>Duality</Name>
<Private>False</Private>
</ProjectReference>
<PackageReference Include="System.Resources.Extensions" Version="4.6.0" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>

<EmbeddedResource Update="Properties\CamViewRes.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>CamViewRes.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Update="Properties\CamViewRes.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>CamViewRes.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
</ItemGroup>
<EmbeddedResource Update="Properties\CamViewRes.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>CamViewRes.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Update="Properties\CamViewRes.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>CamViewRes.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
</ItemGroup>

<ItemGroup>
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Windows.Forms" />
</ItemGroup>

<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).xml" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
</Target>
<Target Name="AggregateOutput" BeforeTargets="AfterBuild">
<Copy SourceFiles="$(OutputPath)$(AssemblyName).dll" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).pdb" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
<Copy SourceFiles="$(OutputPath)$(AssemblyName).xml" DestinationFolder="$(RootFolder)Build\Output\Plugins\" />
</Target>

</Project>
Loading

0 comments on commit 153bd7f

Please sign in to comment.