summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2016-03-28 23:19:51 +0100
committerRui Marinho <me@ruimarinho.net>2016-03-28 23:19:51 +0100
commit62e67abea5a1fa1cb3dcaeaedf5712a8941de0eb (patch)
treec188c035231653ef5c66fe4d83537f70bd1c51a8
parenta3e308190543a0a8fc56eb00a9781fe63873a5c9 (diff)
parente13063cbd4f15f3a58eb7a50d3d3b3f490ac9f20 (diff)
downloadxamarin-forms-62e67abea5a1fa1cb3dcaeaedf5712a8941de0eb.tar.gz
xamarin-forms-62e67abea5a1fa1cb3dcaeaedf5712a8941de0eb.tar.bz2
xamarin-forms-62e67abea5a1fa1cb3dcaeaedf5712a8941de0eb.zip
Merge pull request #29 from xamarin/design-dll-version
Update design projects to reference the correct DLL on multi-VS systems
-rw-r--r--Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj6
-rw-r--r--Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj6
2 files changed, 4 insertions, 8 deletions
diff --git a/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj b/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj
index 7b02ea45..e062c9d8 100644
--- a/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj
+++ b/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj
@@ -32,10 +32,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Unix' ">
- <Reference Include="Microsoft.Windows.Design.Extensibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\Microsoft.Windows.Design.Extensibility.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Microsoft.Windows.Design.Extensibility, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>True</SpecificVersion>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
diff --git a/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj b/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj
index de727cb0..88cd2112 100644
--- a/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj
+++ b/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj
@@ -32,10 +32,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup Condition=" '$(OS)' != 'Unix' ">
- <Reference Include="Microsoft.Windows.Design.Extensibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\lib\Microsoft.Windows.Design.Extensibility.dll</HintPath>
- <Private>False</Private>
+ <Reference Include="Microsoft.Windows.Design.Extensibility, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <SpecificVersion>True</SpecificVersion>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />