diff options
| author | Bertrand Le Roy <beleroy@microsoft.com> | 2018-04-25 00:15:16 +0300 |
|---|---|---|
| committer | Bertrand Le Roy <beleroy@microsoft.com> | 2018-04-25 00:15:16 +0300 |
| commit | 9d89b4907c96afd284a0126f109fcddf7b8e3efa (patch) | |
| tree | 8efb15c9c43dd6b07817faeb2f4f76aad62eee85 /Xamarin.PropertyEditing.Windows.Standalone | |
| parent | 4af9f77cac61dac8758e45e517d5afec306c585e (diff) | |
Fix icons file path in standalone app for the designer-integrated configuration.
Diffstat (limited to 'Xamarin.PropertyEditing.Windows.Standalone')
| -rw-r--r-- | Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj index f5f046c..1fb8e4a 100644 --- a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj +++ b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj @@ -33,9 +33,21 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> - <PropertyGroup Condition="Exists('..\..\designer\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\Resources\ProppyIcons.xaml')"> + <PropertyGroup Condition="Exists('..\..\designer\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\Resources\ProppyIcons.xaml') OR Exists('..\..\..\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\Resources\ProppyIcons.xaml')"> <DefineConstants>$(DefineConstants);USE_VS_ICONS</DefineConstants> </PropertyGroup> + <Choose> + <When Condition="Exists('..\..\designer\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\Resources\ProppyIcons.xaml')"> + <PropertyGroup> + <ProppyIconPath>..\..\designer\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\Resources\ProppyIcons.xaml</ProppyIconPath> + </PropertyGroup> + </When> + <When Condition="Exists('..\..\..\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\Resources\ProppyIcons.xaml')"> + <PropertyGroup> + <ProppyIconPath>..\..\..\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\Resources\ProppyIcons.xaml</ProppyIconPath> + </PropertyGroup> + </When> + </Choose> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Data" /> @@ -72,8 +84,8 @@ </Compile> </ItemGroup> <!-- Conditionally include resource file with icons when the file exists. To be replaced later with default open icons. --> - <ItemGroup Condition="Exists('..\..\designer\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\Resources\ProppyIcons.xaml')"> - <Page Include="..\..\designer\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\Resources\ProppyIcons.xaml"> + <ItemGroup Condition="Exists($(ProppyIconPath))"> + <Page Include="$(ProppyIconPath)"> <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> |