Skip to content

Commit 984ec16

Browse files
samypr100samypr100
committed
post-merge adjustments
1 parent 7f7be51 commit 984ec16

6 files changed

Lines changed: 2 additions & 273 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
- Initial GA Actions Support
1010
- Added New Target .NET 7.0
11+
- Fix TaskDialog.DefaultButton property is ignored
12+
- remove first dot in extension
1113

1214
### 2022-11-04
1315

‎source/WindowsAPICodePack/Core/Core.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,12 @@
1616
<RepositoryUrl>https://github.com/samypr100/Windows-API-Code-Pack-1.1</RepositoryUrl>
1717
<RepositoryType>.git</RepositoryType>
1818
<Copyright>Copyright © 2022</Copyright>
19-
<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>
20-
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
21-
<Copyright>Copyright © 2020</Copyright>
22-
<RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
23-
<RepositoryType>.git</RepositoryType>
2419
<NeutralLanguage>en-US</NeutralLanguage>
2520
<PackageTags>WindowsAPICodePack</PackageTags>
2621
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2722
<IncludeSymbols>true</IncludeSymbols>
2823
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2924
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;net5.0-windows;net6.0-windows;net7.0-windows</TargetFrameworks>
30-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
3125
<UseWindowsForms>true</UseWindowsForms>
3226
<LangVersion>latest</LangVersion>
3327
<RootNamespace>Microsoft.WindowsAPICodePack</RootNamespace>

‎source/WindowsAPICodePack/ExtendedLinguisticServices/ExtendedLinguisticServices.csproj‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -70,67 +70,3 @@
7070
</EmbeddedResource>
7171
</ItemGroup>
7272
</Project>
73-
<PropertyGroup>
74-
<AssemblyName>Microsoft.WindowsAPICodePack.ExtendedLinguisticServices</AssemblyName>
75-
<PackageId>Microsoft-WindowsAPICodePack-ExtendedLinguisticServices</PackageId>
76-
<VersionPrefix>1.1.5</VersionPrefix>
77-
<Title>$(AssemblyName)</Title>
78-
<Authors>rpastric;contre;dahall</Authors>
79-
<Company>Microsoft</Company>
80-
<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
81-
<PackageLicenseUrl>https://github.com/contre/Windows-API-Code-Pack-1.1/LICENSE</PackageLicenseUrl>
82-
<PackageProjectUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</PackageProjectUrl>
83-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
84-
<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>
85-
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
86-
<RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
87-
<RepositoryType>.git</RepositoryType>
88-
<Copyright>Copyright © 2020</Copyright>
89-
<NeutralLanguage>en-US</NeutralLanguage>
90-
<PackageTags>WindowsAPICodePack</PackageTags>
91-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
92-
<IncludeSymbols>true</IncludeSymbols>
93-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
94-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
95-
<UseWindowsForms>true</UseWindowsForms>
96-
<LangVersion>latest</LangVersion>
97-
<RootNamespace>Microsoft.WindowsAPICodePack.ExtendedLinguisticServices</RootNamespace>
98-
<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
99-
<SignAssembly>true</SignAssembly>
100-
<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
101-
</PropertyGroup>
102-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
103-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
104-
</PropertyGroup>
105-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
106-
<Reference Include="System" />
107-
<Reference Include="System.Core" />
108-
<Reference Include="System.Xml.Linq" />
109-
<Reference Include="System.Data.DataSetExtensions" />
110-
<Reference Include="System.Data" />
111-
<Reference Include="System.Xml" />
112-
</ItemGroup>
113-
<ItemGroup>
114-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
115-
<PrivateAssets>all</PrivateAssets>
116-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
117-
</PackageReference>
118-
</ItemGroup>
119-
<ItemGroup>
120-
<ProjectReference Include="..\Core\Core.csproj" />
121-
</ItemGroup>
122-
<ItemGroup>
123-
<Compile Update="Resources\LocalizedMessages.Designer.cs">
124-
<DesignTime>True</DesignTime>
125-
<AutoGen>True</AutoGen>
126-
<DependentUpon>LocalizedMessages.resx</DependentUpon>
127-
</Compile>
128-
</ItemGroup>
129-
<ItemGroup>
130-
<EmbeddedResource Update="Resources\LocalizedMessages.resx">
131-
<CustomToolNamespace>Microsoft.WindowsAPICodePack.Resources</CustomToolNamespace>
132-
<Generator>ResXFileCodeGenerator</Generator>
133-
<LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
134-
</EmbeddedResource>
135-
</ItemGroup>
136-
</Project>

‎source/WindowsAPICodePack/Sensors/Sensors.csproj‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -66,63 +66,3 @@
6666
</EmbeddedResource>
6767
</ItemGroup>
6868
</Project>
69-
<PropertyGroup>
70-
<AssemblyName>Microsoft.WindowsAPICodePack.Sensors</AssemblyName>
71-
<PackageId>Microsoft-WindowsAPICodePack-Sensors</PackageId>
72-
<VersionPrefix>1.1.5</VersionPrefix>
73-
<Title>$(AssemblyName)</Title>
74-
<Authors>rpastric;contre;dahall</Authors>
75-
<Company>Microsoft</Company>
76-
<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
77-
<PackageLicenseUrl>https://github.com/contre/Windows-API-Code-Pack-1.1/LICENSE</PackageLicenseUrl>
78-
<PackageProjectUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</PackageProjectUrl>
79-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
80-
<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>
81-
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
82-
<RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
83-
<RepositoryType>.git</RepositoryType>
84-
<Copyright>Copyright © 2020</Copyright>
85-
<NeutralLanguage>en-US</NeutralLanguage>
86-
<PackageTags>WindowsAPICodePack</PackageTags>
87-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
88-
<IncludeSymbols>true</IncludeSymbols>
89-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
90-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
91-
<UseWindowsForms>true</UseWindowsForms>
92-
<LangVersion>latest</LangVersion>
93-
<RootNamespace>Microsoft.WindowsAPICodePack.Sensors</RootNamespace>
94-
<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
95-
<SignAssembly>true</SignAssembly>
96-
<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
97-
</PropertyGroup>
98-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
99-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
100-
</PropertyGroup>
101-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
102-
<Reference Include="System" />
103-
<Reference Include="System.Core" />
104-
</ItemGroup>
105-
<ItemGroup>
106-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
107-
<PrivateAssets>all</PrivateAssets>
108-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
109-
</PackageReference>
110-
</ItemGroup>
111-
<ItemGroup>
112-
<ProjectReference Include="..\Core\Core.csproj" />
113-
</ItemGroup>
114-
<ItemGroup>
115-
<Compile Update="Resources\LocalizedMessages.Designer.cs">
116-
<DesignTime>True</DesignTime>
117-
<AutoGen>True</AutoGen>
118-
<DependentUpon>LocalizedMessages.resx</DependentUpon>
119-
</Compile>
120-
</ItemGroup>
121-
<ItemGroup>
122-
<EmbeddedResource Update="Resources\LocalizedMessages.resx">
123-
<CustomToolNamespace>Microsoft.WindowsAPICodePack.Resources</CustomToolNamespace>
124-
<Generator>ResXFileCodeGenerator</Generator>
125-
<LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
126-
</EmbeddedResource>
127-
</ItemGroup>
128-
</Project>

‎source/WindowsAPICodePack/Shell/Shell.csproj‎

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -76,74 +76,4 @@
7676
<LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
7777
</EmbeddedResource>
7878
</ItemGroup>
79-
<PropertyGroup>
80-
<AssemblyName>Microsoft.WindowsAPICodePack.Shell</AssemblyName>
81-
<PackageId>Microsoft-WindowsAPICodePack-Shell</PackageId>
82-
<VersionPrefix>1.1.5</VersionPrefix>
83-
<Title>$(AssemblyName)</Title>
84-
<Authors>rpastric;contre;dahall</Authors>
85-
<Company>Microsoft</Company>
86-
<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
87-
<PackageLicenseUrl>https://github.com/contre/Windows-API-Code-Pack-1.1/LICENSE</PackageLicenseUrl>
88-
<PackageProjectUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</PackageProjectUrl>
89-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
90-
<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>
91-
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
92-
<Copyright>Copyright © 2020</Copyright>
93-
<RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
94-
<RepositoryType>.git</RepositoryType>
95-
<NeutralLanguage>en-US</NeutralLanguage>
96-
<PackageTags>WindowsAPICodePack</PackageTags>
97-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
98-
<IncludeSymbols>true</IncludeSymbols>
99-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
100-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
101-
<UseWindowsForms>true</UseWindowsForms>
102-
<UseWPF>true</UseWPF>
103-
<LangVersion>latest</LangVersion>
104-
<RootNamespace>Microsoft.WindowsAPICodePack.Shell</RootNamespace>
105-
<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
106-
<SignAssembly>true</SignAssembly>
107-
<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
108-
</PropertyGroup>
109-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
110-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
111-
</PropertyGroup>
112-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
113-
<Reference Include="CustomMarshalers" />
114-
<Reference Include="PresentationCore" />
115-
<Reference Include="PresentationFramework" />
116-
<Reference Include="System" />
117-
<Reference Include="System.Core" />
118-
<Reference Include="System.Data" />
119-
<Reference Include="System.Drawing" />
120-
<Reference Include="System.Windows.Forms" />
121-
<Reference Include="System.Xaml" />
122-
<Reference Include="System.Xml" />
123-
<Reference Include="WindowsBase" />
124-
<Reference Include="WindowsFormsIntegration" />
125-
</ItemGroup>
126-
<ItemGroup>
127-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
128-
<PrivateAssets>all</PrivateAssets>
129-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
130-
</PackageReference>
131-
</ItemGroup>
132-
<ItemGroup>
133-
<ProjectReference Include="..\Core\Core.csproj" />
134-
</ItemGroup>
135-
<ItemGroup>
136-
<Compile Update="Resources\LocalizedMessages.Designer.cs">
137-
<DesignTime>True</DesignTime>
138-
<AutoGen>True</AutoGen>
139-
<DependentUpon>LocalizedMessages.resx</DependentUpon>
140-
</Compile>
141-
</ItemGroup>
142-
<ItemGroup>
143-
<EmbeddedResource Update="Resources\LocalizedMessages.resx">
144-
<CustomToolNamespace>Microsoft.WindowsAPICodePack.Resources</CustomToolNamespace>
145-
<Generator>ResXFileCodeGenerator</Generator>
146-
<LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
147-
</EmbeddedResource>
148-
</ItemGroup>
14979
</Project>

‎source/WindowsAPICodePack/ShellExtensions/ShellExtensions.csproj‎

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -79,76 +79,3 @@
7979
</EmbeddedResource>
8080
</ItemGroup>
8181
</Project>
82-
<PropertyGroup>
83-
<AssemblyName>Microsoft.WindowsAPICodePack.ShellExtensions</AssemblyName>
84-
<PackageId>Microsoft-WindowsAPICodePack-ShellExtensions</PackageId>
85-
<VersionPrefix>1.1.5</VersionPrefix>
86-
<Title>$(AssemblyName)</Title>
87-
<Authors>rpastric;contre;dahall</Authors>
88-
<Company>Microsoft</Company>
89-
<Product>Microsoft Windows API Code Pack for .NET Framework</Product>
90-
<PackageLicenseUrl>https://github.com/contre/Windows-API-Code-Pack-1.1/LICENSE</PackageLicenseUrl>
91-
<PackageProjectUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</PackageProjectUrl>
92-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
93-
<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>
94-
<PackageReleaseNotes>See CHANGELOG.md in project site. https://github.com/contre/Windows-API-Code-Pack-1.1/blob/master/CHANGELOG.md </PackageReleaseNotes>
95-
<Copyright>Copyright © 2020</Copyright>
96-
<RepositoryUrl>https://github.com/contre/Windows-API-Code-Pack-1.1</RepositoryUrl>
97-
<RepositoryType>.git</RepositoryType>
98-
<NeutralLanguage>en-US</NeutralLanguage>
99-
<PackageTags>WindowsAPICodePack</PackageTags>
100-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
101-
<IncludeSymbols>true</IncludeSymbols>
102-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
103-
<TargetFrameworks>net452;net462;net472;net48;net481;netcoreapp3.1;;net6.0-windows;net7.0-windows</TargetFrameworks>
104-
<UseWindowsForms>true</UseWindowsForms>
105-
<UseWPF>true</UseWPF>
106-
<LangVersion>latest</LangVersion>
107-
<RootNamespace>Microsoft.WindowsAPICodePack.ShellExtensions</RootNamespace>
108-
<DocumentationFile>..\bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
109-
<SignAssembly>true</SignAssembly>
110-
<AssemblyOriginatorKeyFile>ProjectSignKey.snk</AssemblyOriginatorKeyFile>
111-
</PropertyGroup>
112-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
113-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
114-
</PropertyGroup>
115-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
116-
<Reference Include="PresentationCore" />
117-
<Reference Include="PresentationFramework" />
118-
<Reference Include="System" />
119-
<Reference Include="System.Core" />
120-
<Reference Include="System.Drawing" />
121-
<Reference Include="System.Windows.Forms" />
122-
<Reference Include="System.Xaml" />
123-
<Reference Include="System.Xml.Linq" />
124-
<Reference Include="System.Data.DataSetExtensions" />
125-
<Reference Include="Microsoft.CSharp" />
126-
<Reference Include="System.Data" />
127-
<Reference Include="System.Xml" />
128-
<Reference Include="WindowsBase" />
129-
</ItemGroup>
130-
<ItemGroup>
131-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
132-
<PrivateAssets>all</PrivateAssets>
133-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
134-
</PackageReference>
135-
</ItemGroup>
136-
<ItemGroup>
137-
<ProjectReference Include="..\Core\Core.csproj" />
138-
<ProjectReference Include="..\Shell\Shell.csproj" />
139-
</ItemGroup>
140-
<ItemGroup>
141-
<Compile Update="Resources\LocalizedMessages.Designer.cs">
142-
<DesignTime>True</DesignTime>
143-
<AutoGen>True</AutoGen>
144-
<DependentUpon>LocalizedMessages.resx</DependentUpon>
145-
</Compile>
146-
</ItemGroup>
147-
<ItemGroup>
148-
<EmbeddedResource Update="Resources\LocalizedMessages.resx">
149-
<CustomToolNamespace>Microsoft.WindowsAPICodePack.Resources</CustomToolNamespace>
150-
<Generator>ResXFileCodeGenerator</Generator>
151-
<LastGenOutput>LocalizedMessages.Designer.cs</LastGenOutput>
152-
</EmbeddedResource>
153-
</ItemGroup>
154-
</Project>

0 commit comments

Comments
 (0)