Skip to content

Commit

Permalink
Merge pull request #306 from XAMLMarkupExtensions/development
Browse files Browse the repository at this point in the history
check next release
  • Loading branch information
konne authored Aug 19, 2021
2 parents 3e71394 + c2e03e7 commit 91df7cf
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions src/WPFLocalizeExtension.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<!--<TargetFrameworks>net452;net40;netcoreapp3.1</TargetFrameworks>-->
<TargetFramework>net452</TargetFramework>
<TargetFrameworks>net452;net40;netcoreapp3.1</TargetFrameworks>
<UseWPF>True</UseWPF>
<AutoGenerateBindingRedirects Condition="!$(TargetFramework.StartsWith('netcore'))">true</AutoGenerateBindingRedirects>
<AssemblyName>WPFLocalizeExtension</AssemblyName>
Expand Down Expand Up @@ -37,12 +36,12 @@
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GenerateDocumentationFile>false</GenerateDocumentationFile>

<!--Workaround AssemblyVersion Duplicate from UseWPF" -->
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<!--Workaround AssemblyVersion Duplicate from UseWPF" -->
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

<UnSignedFlag></UnSignedFlag>
<UnSignedFlag></UnSignedFlag>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -89,7 +88,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="XAMLMarkupExtensions$(UnSignedFlag)" Version="2.0.0" />
<PackageReference Include="XAMLMarkupExtensions$(UnSignedFlag)" Version="2.1.0" />
</ItemGroup>

<Target Name="PublishToNugetWithAPIKey" AfterTargets="GenerateNuspec">
Expand Down

0 comments on commit 91df7cf

Please sign in to comment.