post-merge adjustments

samypr100 · Jun 18, 2023 · 984ec16 · 984ec16
1 parent 7f7be51
commit 984ec16
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 273 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 - Initial GA Actions Support
 - Added New Target .NET 7.0
+- Fix TaskDialog.DefaultButton property is ignored
+- remove first dot in extension
 
 ### 2022-11-04
 

diff --git a/source/WindowsAPICodePack/Core/Core.csproj b/source/WindowsAPICodePack/Core/Core.csproj
@@ -16,18 +16,12 @@
     <RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
     <RepositoryType>.git</RepositoryType>
     <Copyright>Copyright © 2022</Copyright>
-    <Description>The Core code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2020-01-04.</Description>
-    <PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
-    <Copyright>Copyright © 2020</Copyright>
-    <RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
-    <RepositoryType>.git</RepositoryType>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageTags>WindowsAPICodePack</PackageTags>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows</TargetFrameworks>
-	  <TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>latest</LangVersion>
     <RootNamespace>Microsoft.WindowsAPICodePack</RootNamespace>

diff --git a/source/WindowsAPICodePack/ExtendedLinguisticServices/ExtendedLinguisticServices.csproj b/source/WindowsAPICodePack/ExtendedLinguisticServices/ExtendedLinguisticServices.csproj
@@ -70,67 +70,3 @@
     </EmbeddedResource>
   </ItemGroup>
 </Project>
-	<PropertyGroup>
-		<AssemblyName>Microsoft.WindowsAPICodePack.ExtendedLinguisticServices</AssemblyName>
-		<PackageId>Microsoft-WindowsAPICodePack-ExtendedLinguisticServices</PackageId>
-		<VersionPrefix>1.1.5</VersionPrefix>
-		<Title>$(AssemblyName)</Title>
-		<Authors>rpastric;contre;dahall</Authors>
-		<Company>Microsoft</Company>
-		<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
-		<PackageLicenseUrl>https://github.com/contre/Windows-API-Code-Pack-1.1/LICENSE</PackageLicenseUrl>
-		<PackageProjectUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</PackageProjectUrl>
-		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<Description>The Extended Linguistic Services code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2020-01-04.</Description>
-		<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
-		<RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
-		<RepositoryType>.git</RepositoryType>
-		<Copyright>Copyright © 2020</Copyright>
-		<NeutralLanguage>en-US</NeutralLanguage>
-		<PackageTags>WindowsAPICodePack</PackageTags>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
-		<UseWindowsForms>true</UseWindowsForms>
-		<LangVersion>latest</LangVersion>
-		<RootNamespace>Microsoft.WindowsAPICodePack.ExtendedLinguisticServices</RootNamespace>
-		<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	</PropertyGroup>
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
-		<Reference Include="System" />
-		<Reference Include="System.Core" />
-		<Reference Include="System.Xml.Linq" />
-		<Reference Include="System.Data.DataSetExtensions" />
-		<Reference Include="System.Data" />
-		<Reference Include="System.Xml" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Core\Core.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Update="Resources\LocalizedMessages.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>LocalizedMessages.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Update="Resources\LocalizedMessages.resx">
-			<CustomToolNamespace>Microsoft.WindowsAPICodePack.Resources</CustomToolNamespace>
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
-</Project>
diff --git a/source/WindowsAPICodePack/Sensors/Sensors.csproj b/source/WindowsAPICodePack/Sensors/Sensors.csproj
@@ -66,63 +66,3 @@
     </EmbeddedResource>
   </ItemGroup>
 </Project>
-	<PropertyGroup>
-		<AssemblyName>Microsoft.WindowsAPICodePack.Sensors</AssemblyName>
-		<PackageId>Microsoft-WindowsAPICodePack-Sensors</PackageId>
-		<VersionPrefix>1.1.5</VersionPrefix>
-		<Title>$(AssemblyName)</Title>
-		<Authors>rpastric;contre;dahall</Authors>
-		<Company>Microsoft</Company>
-		<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
-		<PackageLicenseUrl>https://github.com/contre/Windows-API-Code-Pack-1.1/LICENSE</PackageLicenseUrl>
-		<PackageProjectUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</PackageProjectUrl>
-		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<Description>The Sensors code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2020-01-04.</Description>
-		<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
-		<RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
-		<RepositoryType>.git</RepositoryType>
-		<Copyright>Copyright © 2020</Copyright>
-		<NeutralLanguage>en-US</NeutralLanguage>
-		<PackageTags>WindowsAPICodePack</PackageTags>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
-		<UseWindowsForms>true</UseWindowsForms>
-		<LangVersion>latest</LangVersion>
-		<RootNamespace>Microsoft.WindowsAPICodePack.Sensors</RootNamespace>
-		<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	</PropertyGroup>
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
-		<Reference Include="System" />
-		<Reference Include="System.Core" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Core\Core.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Update="Resources\LocalizedMessages.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>LocalizedMessages.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Update="Resources\LocalizedMessages.resx">
-			<CustomToolNamespace>Microsoft.WindowsAPICodePack.Resources</CustomToolNamespace>
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
-</Project>
diff --git a/source/WindowsAPICodePack/Shell/Shell.csproj b/source/WindowsAPICodePack/Shell/Shell.csproj
@@ -76,74 +76,4 @@
       <LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-	<PropertyGroup>
-		<AssemblyName>Microsoft.WindowsAPICodePack.Shell</AssemblyName>
-		<PackageId>Microsoft-WindowsAPICodePack-Shell</PackageId>
-		<VersionPrefix>1.1.5</VersionPrefix>
-		<Title>$(AssemblyName)</Title>
-		<Authors>rpastric;contre;dahall</Authors>
-		<Company>Microsoft</Company>
-		<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
-		<PackageLicenseUrl>https://github.com/contre/Windows-API-Code-Pack-1.1/LICENSE</PackageLicenseUrl>
-		<PackageProjectUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</PackageProjectUrl>
-		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<Description>The Shell code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2020-01-04.</Description>
-		<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
-		<Copyright>Copyright © 2020</Copyright>
-		<RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
-		<RepositoryType>.git</RepositoryType>
-		<NeutralLanguage>en-US</NeutralLanguage>
-		<PackageTags>WindowsAPICodePack</PackageTags>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
-		<UseWindowsForms>true</UseWindowsForms>
-		<UseWPF>true</UseWPF>
-		<LangVersion>latest</LangVersion>
-		<RootNamespace>Microsoft.WindowsAPICodePack.Shell</RootNamespace>
-		<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	</PropertyGroup>
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
-		<Reference Include="CustomMarshalers" />
-		<Reference Include="PresentationCore" />
-		<Reference Include="PresentationFramework" />
-		<Reference Include="System" />
-		<Reference Include="System.Core" />
-		<Reference Include="System.Data" />
-		<Reference Include="System.Drawing" />
-		<Reference Include="System.Windows.Forms" />
-		<Reference Include="System.Xaml" />
-		<Reference Include="System.Xml" />
-		<Reference Include="WindowsBase" />
-		<Reference Include="WindowsFormsIntegration" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Core\Core.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Update="Resources\LocalizedMessages.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>LocalizedMessages.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Update="Resources\LocalizedMessages.resx">
-			<CustomToolNamespace>Microsoft.WindowsAPICodePack.Resources</CustomToolNamespace>
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
 </Project>
diff --git a/source/WindowsAPICodePack/ShellExtensions/ShellExtensions.csproj b/source/WindowsAPICodePack/ShellExtensions/ShellExtensions.csproj
@@ -79,76 +79,3 @@
     </EmbeddedResource>
   </ItemGroup>
 </Project>
-	<PropertyGroup>
-		<AssemblyName>Microsoft.WindowsAPICodePack.ShellExtensions</AssemblyName>
-		<PackageId>Microsoft-WindowsAPICodePack-ShellExtensions</PackageId>
-		<VersionPrefix>1.1.5</VersionPrefix>
-		<Title>$(AssemblyName)</Title>
-		<Authors>rpastric;contre;dahall</Authors>
-		<Company>Microsoft</Company>
-		<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
-		<PackageLicenseUrl>https://github.com/contre/Windows-API-Code-Pack-1.1/LICENSE</PackageLicenseUrl>
-		<PackageProjectUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</PackageProjectUrl>
-		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<Description>The ShellExtensions code for the WindowsAPICodePack. This is an updated version containing all available bug fixes for this code as of 2020-01-04.</Description>
-		<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
-		<Copyright>Copyright © 2020</Copyright>
-		<RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
-		<RepositoryType>.git</RepositoryType>
-		<NeutralLanguage>en-US</NeutralLanguage>
-		<PackageTags>WindowsAPICodePack</PackageTags>
-		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
-		<UseWindowsForms>true</UseWindowsForms>
-		<UseWPF>true</UseWPF>
-		<LangVersion>latest</LangVersion>
-		<RootNamespace>Microsoft.WindowsAPICodePack.ShellExtensions</RootNamespace>
-		<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
-		<SignAssembly>true</SignAssembly>
-		<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	</PropertyGroup>
-	<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
-		<Reference Include="PresentationCore" />
-		<Reference Include="PresentationFramework" />
-		<Reference Include="System" />
-		<Reference Include="System.Core" />
-		<Reference Include="System.Drawing" />
-		<Reference Include="System.Windows.Forms" />
-		<Reference Include="System.Xaml" />
-		<Reference Include="System.Xml.Linq" />
-		<Reference Include="System.Data.DataSetExtensions" />
-		<Reference Include="Microsoft.CSharp" />
-		<Reference Include="System.Data" />
-		<Reference Include="System.Xml" />
-		<Reference Include="WindowsBase" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Core\Core.csproj" />
-		<ProjectReference Include="..\Shell\Shell.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<Compile Update="Resources\LocalizedMessages.Designer.cs">
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-			<DependentUpon>LocalizedMessages.resx</DependentUpon>
-		</Compile>
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Update="Resources\LocalizedMessages.resx">
-			<CustomToolNamespace>Microsoft.WindowsAPICodePack.Resources</CustomToolNamespace>
-			<Generator>ResXFileCodeGenerator</Generator>
-			<LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
-		</EmbeddedResource>
-	</ItemGroup>
-</Project>