Skip to content

Commit c505135

Browse files
augustoproieteaugustoproiete
committed
Update SDK project and NuGet metadata
1 parent 3388914 commit c505135

File tree

3 files changed

+81
-105
lines changed

3 files changed

+81
-105
lines changed

‎sample/Ookii.Dialogs.Wpf.Sample/Ookii.Dialogs.Wpf.Sample.csproj

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4+
<TargetFrameworks>netcoreapp3.1;net45</TargetFrameworks>
45
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
66
<UseWPF>true</UseWPF>
77
<UseWindowsForms>true</UseWindowsForms>
8+
<RootNamespace>Ookii.Dialogs.Wpf.Sample</RootNamespace>
9+
10+
<AssemblyName>Ookii.Dialogs.Wpf.Sample</AssemblyName>
811
<ApplicationIcon>ookii.ico</ApplicationIcon>
9-
<Version>1.0.0</Version>
10-
<Company>Ookii.org</Company>
11-
<Authors>Sven Groot</Authors>
12-
<Product>Ookii.Dialogs</Product>
13-
<Description>A sample app that demonstrates how Ookii.Dialogs works.</Description>
14-
<Copyright>Copyright (c) Sven Groot (Ookii.org) 2009</Copyright>
1512
<NeutralLanguage>en</NeutralLanguage>
16-
<AssemblyVersion>1.0.0.20307</AssemblyVersion>
17-
<FileVersion>1.0.0.20307</FileVersion>
18-
<Company>Ookii.org</Company>
1913
<ApplicationManifest>app.manifest</ApplicationManifest>
20-
<StartupObject></StartupObject>
21-
<AssemblyName>Ookii.Dialogs.Wpf.Sample</AssemblyName>
22-
<RootNamespace>Ookii.Dialogs.Wpf.Sample</RootNamespace>
14+
15+
<SignAssembly>true</SignAssembly>
16+
<AssemblyOriginatorKeyFile>../../assets/ookii-dialogs.snk</AssemblyOriginatorKeyFile>
17+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
18+
19+
<NoWarn>$(NoWarn);NU5048</NoWarn>
20+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
21+
<TreatSpecificWarningsAsErrors />
2322
</PropertyGroup>
2423

25-
<ItemGroup>
26-
<ProjectReference Include="..\..\src\Ookii.Dialogs.Wpf\Ookii.Dialogs.Wpf.csproj" />
27-
</ItemGroup>
24+
<PropertyGroup>
25+
<DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net45' ">true</DisableImplicitFrameworkReferences>
26+
</PropertyGroup>
2827

29-
<ItemGroup Condition="$(TargetFramework) == net45">
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
3029
<Reference Include="System" />
3130
<Reference Include="System.Core" />
3231
<Reference Include="System.Xaml" />
@@ -36,5 +35,8 @@
3635
<Reference Include="PresentationFramework" />
3736
</ItemGroup>
3837

38+
<ItemGroup>
39+
<ProjectReference Include="..\..\src\Ookii.Dialogs.Wpf\Ookii.Dialogs.Wpf.csproj" />
40+
</ItemGroup>
3941

4042
</Project>

‎src/Ookii.Dialogs.Wpf/Ookii.Dialogs.Wpf.csproj

Lines changed: 62 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,64 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net45</TargetFrameworks>
5-
<AssemblyName>Ookii.Dialogs.Wpf</AssemblyName>
6-
<RootNamespace>Ookii.Dialogs.Wpf</RootNamespace>
7-
<PackageId>Ookii.Dialogs.Wpf</PackageId>
8-
<Version>2.1.1</Version>
4+
<TargetFrameworks>net45;netcoreapp3.1</TargetFrameworks>
95
<UseWPF>true</UseWPF>
106
<UseWindowsForms>true</UseWindowsForms>
11-
<Authors>Sven Groot, Caio Proiete, AceOfAces</Authors>
12-
<Summary>Common dialog classes for WPF applications.</Summary>
13-
<Description>Ookii.Dialogs.Wpf is a class library for .NET and .NET Core applications providing several common dialogs. Included are classes for task dialogs, credential dialogs, progress dialogs, and common file dialogs.</Description>
14-
<PackageProjectUrl>https://github.com/augustoproiete/ookii-dialogs-wpf</PackageProjectUrl>
15-
<RepositoryUrl>https://github.com/acemod13/ookii-dialogs-wpf</RepositoryUrl>
16-
<RepositoryType></RepositoryType>
17-
<PackageTags>ookii dialogs wpf windows-presentation-foundation progress-dialog task-dialog credential-dialog common-file-dialog</PackageTags>
18-
<PackageLicenseFile>LICENSE</PackageLicenseFile>
19-
<PackageIconUrl></PackageIconUrl>
20-
<NeutralLanguage>en</NeutralLanguage>
21-
<AssemblyVersion>2.1.20307.0</AssemblyVersion>
22-
<FileVersion>2.1.20307.0</FileVersion>
23-
<Copyright>Copyright (c) Sven Groot (Ookii.org) 2009.</Copyright>
24-
<Company>Ookii.org</Company>
25-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
26-
<TieredCompilationQuickJit>true</TieredCompilationQuickJit>
27-
<TieredCompilation>true</TieredCompilation>
28-
<PackageIcon>ookii-dialogs-wpf-nuget.png</PackageIcon>
7+
<RootNamespace>Ookii.Dialogs.Wpf</RootNamespace>
8+
9+
<AssemblyName>Ookii.Dialogs.Wpf</AssemblyName>
10+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
11+
<GenerateAssemblyVersionAttribute>true</GenerateAssemblyVersionAttribute>
12+
<GenerateAssemblyFileVersionAttribute>true</GenerateAssemblyFileVersionAttribute>
13+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
14+
15+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
16+
<DebugType>portable</DebugType>
2917
<IncludeSymbols>true</IncludeSymbols>
18+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3019
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
20+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
21+
22+
<SignAssembly>true</SignAssembly>
23+
<AssemblyOriginatorKeyFile>../../assets/ookii-dialogs.snk</AssemblyOriginatorKeyFile>
24+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
25+
26+
<NoWarn>$(NoWarn);NU5048</NoWarn>
27+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
28+
<TreatSpecificWarningsAsErrors />
29+
30+
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
31+
<TieredCompilation>true</TieredCompilation>
32+
<TieredCompilationQuickJit>true</TieredCompilationQuickJit>
3133
</PropertyGroup>
3234

33-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
34-
<ShouldCreateLogs>True</ShouldCreateLogs>
35-
<AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
36-
<UpdateAssemblyVersion>True</UpdateAssemblyVersion>
37-
<UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
38-
<UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
39-
<AssemblyVersionSettings>None.None.DateStamp.None</AssemblyVersionSettings>
40-
<UpdatePackageVersion>True</UpdatePackageVersion>
41-
<AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
42-
<InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
43-
<AssemblyFileVersionSettings>None.None.DateStamp.None</AssemblyFileVersionSettings>
44-
<PackageVersionSettings>AssemblyVersion.None.None</PackageVersionSettings>
35+
<PropertyGroup>
36+
<MinClientVersion>3.3</MinClientVersion>
37+
<PackageId>Ookii.Dialogs.Wpf</PackageId>
38+
<Version>0.0.1-local</Version>
39+
<Authors>Ookii Dialogs Contributors</Authors>
40+
<Company>augustoproiete.net</Company>
41+
<Description>Ookii.Dialogs.Wpf is a class library for .NET and .NET Core applications providing several common dialogs. Included are classes for task dialogs, credential dialogs, progress dialogs, and common file dialogs.</Description>
42+
<Copyright>Copyright (c) 2009-2020 Ookii Dialogs Contributors</Copyright>
43+
<PackageTags>ookii;dialogs;wpf;windows-presentation-foundation;progress-dialog;task-dialog;credential-dialog;common-file-dialog</PackageTags>
44+
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
45+
<PackageIcon>images\icon.png</PackageIcon>
46+
<PackageIconUrl>https://raw.githubusercontent.com/augustoproiete/ookii-dialogs-wpf/master/assets/ookii-dialogs-wpf-nuget.png</PackageIconUrl>
47+
<PackageProjectUrl>https://github.com/augustoproiete/ookii-dialogs-wpf</PackageProjectUrl>
48+
<PackageReleaseNotes>https://github.com/augustoproiete/ookii-dialogs-wpf/releases</PackageReleaseNotes>
49+
<RepositoryType>git</RepositoryType>
50+
<RepositoryUrl>https://github.com/augustoproiete/ookii-dialogs-wpf.git</RepositoryUrl>
51+
</PropertyGroup>
52+
53+
<PropertyGroup>
54+
<DisableImplicitFrameworkReferences Condition=" '$(TargetFramework)' == 'net45' ">true</DisableImplicitFrameworkReferences>
4555
</PropertyGroup>
4656

4757
<ItemGroup>
48-
<None Remove="CredentialDialog.bmp" />
49-
<None Remove="CustomDictionary.xml" />
50-
<None Remove="ProgressDialog.bmp" />
51-
<None Remove="TaskDialog.bmp" />
52-
<None Remove="VistaFolderBrowserDialog.bmp" />
53-
<None Remove="VistaOpenFileDialog.bmp" />
54-
<None Remove="VistaSaveFileDialog.bmp" />
55-
<None Include="..\..\assets\ookii-dialogs-wpf-nuget.png">
56-
<Pack>True</Pack>
57-
<PackagePath></PackagePath>
58-
</None>
59-
<None Include="..\..\LICENSE">
60-
<Pack>True</Pack>
61-
<PackagePath></PackagePath>
62-
</None>
58+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
6359
</ItemGroup>
6460

65-
<ItemGroup Condition="$(TargetFramework) == net45">
61+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
6662
<Reference Include="PresentationCore" />
6763
<Reference Include="PresentationFramework" />
6864
<Reference Include="System" />
@@ -73,6 +69,20 @@
7369
<Reference Include="WindowsBase" />
7470
</ItemGroup>
7571

72+
<ItemGroup>
73+
<None Remove="*.DotSettings" />
74+
</ItemGroup>
75+
76+
<ItemGroup>
77+
<None Remove="CredentialDialog.bmp" />
78+
<None Remove="CustomDictionary.xml" />
79+
<None Remove="ProgressDialog.bmp" />
80+
<None Remove="TaskDialog.bmp" />
81+
<None Remove="VistaFolderBrowserDialog.bmp" />
82+
<None Remove="VistaOpenFileDialog.bmp" />
83+
<None Remove="VistaSaveFileDialog.bmp" />
84+
</ItemGroup>
85+
7686
<ItemGroup>
7787
<CodeAnalysisDictionary Include="CustomDictionary.xml" />
7888
</ItemGroup>
@@ -123,9 +133,7 @@
123133
</ItemGroup>
124134

125135
<ItemGroup>
126-
<None Update="Ookii.Dialogs.Wpf.nuspec">
127-
<SubType>Designer</SubType>
128-
</None>
136+
<None Include="..\..\assets\ookii-dialogs-wpf-nuget.png" Pack="true" Visible="false" PackagePath="images\icon.png" />
129137
</ItemGroup>
130138

131139
</Project>

‎src/Ookii.Dialogs.Wpf/Ookii.Dialogs.Wpf.nuspec

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)