Skip to content

Enabled strong name for WPF projects #1890

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

Merged
Keboo merged 2 commits into from
Jun 12, 2020
Merged

Enabled strong name for WPF projects #1890

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
8e8e879
Enabled strong name for WPF projects
shjin404 Jun 4, 2020
3818233
Moved common properties to Directory.Build.props
Keboo Jun 12, 2020
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
14 changes: 14 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project>
<PropertyGroup>
<Copyright>Copyright © 2020</Copyright>
<Company>Mulholland Software/James Willock</Company>

<Configurations>Debug;Release</Configurations>
<LangVersion>8.0</LangVersion>
<ErrorReport>prompt</ErrorReport>

<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
</PropertyGroup>
</Project>
2 changes: 0 additions & 2 deletions MahMaterialDragablzMashUp/MahAppsDragablzDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AssemblyTitle>MahMaterialDragablzMashUp</AssemblyTitle>
<Product>MahMaterialDragablzMashUp</Product>
<Copyright>Copyright © 2020</Copyright>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions MainDemo.Wpf/MaterialDesignDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AssemblyTitle>MaterialDesignColors.WpfExample</AssemblyTitle>
<Product>MaterialDesignColors.WpfExample</Product>
<Copyright>Copyright © 2020</Copyright>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<Configurations>Debug;Release</Configurations>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<ApplicationIcon>favicon.ico</ApplicationIcon>
<LangVersion>8.0</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>
<Import Project="..\packages\ShowMeTheXAML.MSBuild\build\ShowMeTheXAML.MSBuild.targets" Label="Paket" />
Expand Down
2 changes: 0 additions & 2 deletions MaterialDesignColors.Wpf.Tests/MaterialDesignColors.Wpf.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<AssemblyTitle>MaterialDesignColors.Wpf.Fixture</AssemblyTitle>
<Product>MaterialDesignColors.Wpf.Fixture</Product>
<Copyright>Copyright © 2020</Copyright>
<LangVersion>8.0</LangVersion>
</PropertyGroup>
<Import Project="..\packages\xunit.core\build\xunit.core.props" Condition="Exists('..\packages\xunit.core\build\xunit.core.props')" Label="Paket" />
<Import Project="..\packages\xunit.runner.visualstudio\build\$(__paket__xunit_runner_visualstudio_props).props" Condition="Exists('..\packages\xunit.runner.visualstudio\build\$(__paket__xunit_runner_visualstudio_props).props')" Label="Paket" />
Expand Down
5 changes: 0 additions & 5 deletions MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<MDIXColorsVersion Condition="$(MDIXColorsVersion) == '' Or $(MDIXColorsVersion) == '*Undefined*'">1.0.1</MDIXColorsVersion>
<AssemblyTitle>MaterialDesignColors.Wpf</AssemblyTitle>
<Company>Mulholland Software/James Willock</Company>
<Product>MaterialDesignColors.Wpf</Product>
<Description>Material Design in XAML Toolkit - Colors</Description>
<Copyright>Copyright © 2020</Copyright>
<Version>$(MDIXColorsVersion)</Version>
<AssemblyVersion>$(MDIXColorsVersion)</AssemblyVersion>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<Configurations>Debug;Release</Configurations>
<LangVersion>8.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
</Project>
2 changes: 0 additions & 2 deletions MaterialDesignThemes.MahApps/MaterialDesignThemes.MahApps.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
<MDIXMahAppsVersion Condition="$(MDIXMahAppsVersion) == '' Or $(MDIXMahAppsVersion) == '*Undefined*'">1.0.1</MDIXMahAppsVersion>
<AssemblyTitle>MaterialDesignThemes.MahApps</AssemblyTitle>
<Product>MaterialDesignThemes.MahApps</Product>
<Copyright>Copyright © 2020 James Willock, Mulholland Software &amp; Contributors</Copyright>
<Version>$(MDIXMahAppsVersion)</Version>
<AssemblyVersion>$(MDIXMahAppsVersion)</AssemblyVersion>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<LangVersion>8.0</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<PropertyGroup>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<UseWPF>true</UseWPF>
<LangVersion>8.0</LangVersion>
<AssemblyTitle>MaterialDesignThemes.Wpf.Tests</AssemblyTitle>
<Product>MaterialDesignThemes.Wpf.Tests</Product>
<Copyright>Copyright © 2020</Copyright>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
<Reference Include="PresentationCore" />
Expand Down
5 changes: 0 additions & 5 deletions MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,13 @@
<UseWPF>true</UseWPF>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<MDIXVersion Condition="$(MDIXVersion) == '' Or $(MDIXVersion) == '*Undefined*'">1.0.1</MDIXVersion>
<LangVersion>8.0</LangVersion>
<AssemblyTitle>MaterialDesignThemes.Wpf</AssemblyTitle>
<Company>Mulholland Software/James Willock</Company>
<Product>MaterialDesignColors.Wpf</Product>
<Description>Material Design in XAML Toolkit - WPF Themes</Description>
<Copyright>Copyright © 2020</Copyright>
<Version>$(MDIXVersion)</Version>
<AssemblyVersion>$(MDIXVersion)</AssemblyVersion>
<NoWarn>CS1591;CS1574</NoWarn>
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
<Configurations>Debug;Release</Configurations>
<ErrorReport>prompt</ErrorReport>
<DocumentationFile>bin\$(Configuration)\MaterialDesignThemes.Wpf.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
Expand Down
7 changes: 6 additions & 1 deletion MaterialDesignThemes.Wpf/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,9 @@
// app, or any theme specific resource dictionaries)
)]

[assembly: InternalsVisibleTo("MaterialDesignThemes.Wpf.Tests")]
[assembly: InternalsVisibleTo("MaterialDesignThemes.Wpf.Tests, PublicKey=" +
"002400000480000094000000060200000024000052534131000400000100010049bc83151c3134" +
"36a8868431b570bc5d626bc74d2d414b3147ae4e5945b69da039e5d22906b224557e5a8dfb3f86" +
"0f0bec65b13217a0eaa37f0cced961386e92fd4d920179893d348b0210660f73e47adbc481c7b5" +
"b63afbf3e60199685794599d28e915a30ca7dc879d9ad0dd0a0e7ea5e99937d637c4b1cb671fa4" +
"425248dd")]
1 change: 1 addition & 0 deletions MaterialDesignToolkit.Wpf.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
azure-pipelines.yml = azure-pipelines.yml
Directory.Build.props = Directory.Build.props
global.json = global.json
MaterialDesignColors.nuspec = MaterialDesignColors.nuspec
MaterialDesignThemes.MahApps.nuspec = MaterialDesignThemes.MahApps.nuspec
Expand Down
Binary file added key.snk
View file
Open in desktop
Binary file not shown.