Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 9cf2e3d

Browse files
rmarinhokrdmllr
andauthored
[WPF] Fix assembly version conflicts (#11910) fixes #11328 fixes #10489 (#12011)
* Add assembly version infos * Update Xamarin.Forms.Platform.WPF/Properties/AssemblyInfo.cs Co-authored-by: Rui Marinho <[email protected]> Co-authored-by: Konrad Müller <[email protected]>
1 parent 738e291 commit 9cf2e3d

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
33
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netcoreapp3.1;net461;</TargetFrameworks>
44
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net461;</TargetFrameworks>
@@ -7,7 +7,7 @@
77
<OutputType>WinExe</OutputType>
88
<UseWPF>true</UseWPF>
99
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
10-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10+
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
1111
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1212
</PropertyGroup>
1313
<PropertyGroup>

Xamarin.Forms.Platform.WPF/Properties/AssemblyInfo.cs

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Windows;
1+
using System.Reflection;
2+
using System.Windows;
23
using Xamarin.Forms;
34
using Xamarin.Forms.Platform.WPF;
45
using Xamarin.Forms.Shapes;
@@ -71,4 +72,16 @@
7172

7273
// Others
7374
[assembly: Xamarin.Forms.Dependency(typeof(ResourcesProvider))]
74-
[assembly: Xamarin.Forms.Dependency(typeof(Deserializer))]
75+
[assembly: Xamarin.Forms.Dependency(typeof(Deserializer))]
76+
77+
[assembly: AssemblyVersion("2.0.0.0")]
78+
[assembly: AssemblyFileVersion(ThisAssembly.Git.BaseVersion.Major + "."
79+
+ ThisAssembly.Git.BaseVersion.Minor + "."
80+
+ ThisAssembly.Git.BaseVersion.Patch + "."
81+
+ ThisAssembly.Git.Commits)]
82+
[assembly: AssemblyInformationalVersion(ThisAssembly.Git.SemVer.Major + "."
83+
+ ThisAssembly.Git.SemVer.Minor + "."
84+
+ ThisAssembly.Git.SemVer.Patch
85+
+ ThisAssembly.Git.SemVer.DashLabel + "+"
86+
+ ThisAssembly.Git.Commits + "-sha."
87+
+ ThisAssembly.Git.Commit)]

0 commit comments

Comments
 (0)