Preview flag is now hidden if .vsix is a marketplace release. Fixes #95

StefanKert · Jul 17, 2020 · dd59fcc · dd59fcc
1 parent 391d348
commit dd59fcc
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/src/BuildVision.Common/BuildVision.Common.csproj b/src/BuildVision.Common/BuildVision.Common.csproj
@@ -32,4 +32,8 @@
     <ProjectReference Include="..\BuildVision.Contracts\BuildVision.Contracts.csproj" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(Configuration)' == 'Marketplace'">
+    <DefineConstants>MARKETPLACE</DefineConstants>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/BuildVision.Contracts/BuildVision.Contracts.csproj b/src/BuildVision.Contracts/BuildVision.Contracts.csproj
@@ -22,4 +22,8 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(Configuration)' == 'Marketplace'">
+    <DefineConstants>MARKETPLACE</DefineConstants>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/BuildVision.Exports/BuildVision.Exports.csproj b/src/BuildVision.Exports/BuildVision.Exports.csproj
@@ -15,4 +15,8 @@
     <ProjectReference Include="..\BuildVision.Contracts\BuildVision.Contracts.csproj" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(Configuration)' == 'Marketplace'">
+    <DefineConstants>MARKETPLACE</DefineConstants>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/BuildVision.UI/BuildVision.UI.csproj b/src/BuildVision.UI/BuildVision.UI.csproj
@@ -42,7 +42,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Marketplace|AnyCPU'">
     <OutputPath>bin\Marketplace\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;MARKETPLACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/src/BuildVision.UI/Components/ControlView.xaml b/src/BuildVision.UI/Components/ControlView.xaml
@@ -40,7 +40,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
-        <Border ClipToBounds="True" SnapsToDevicePixels="True"  Panel.ZIndex="1000" Height="Auto" VerticalAlignment="Top" Margin="0,0" Padding="5,0,5,1" Background="#D63F26" CornerRadius="2" Visibility="{Binding PreviewVersion, Converter={StaticResource BoolToVisibilityConverter}}" HorizontalAlignment="Left">
+        <Border ClipToBounds="True" SnapsToDevicePixels="True"  Panel.ZIndex="1000" Height="Auto" VerticalAlignment="Top" Margin="0,0" Padding="5,0,5,1" Background="#D63F26" CornerRadius="2" Visibility="{Binding Source={x:Static viewModels:BuildVisionPaneViewModel.PreviewVersion}, Converter={StaticResource BoolToVisibilityConverter}}" HorizontalAlignment="Left">
             <Border.LayoutTransform>
                 <RotateTransform Angle="-50"/>
             </Border.LayoutTransform>

diff --git a/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs b/src/BuildVision.UI/ViewModels/BuildVisionPaneViewModel.cs
@@ -48,9 +48,9 @@ public class BuildVisionPaneViewModel : BindableBase, IBuildVisionPaneViewModel
         private readonly ILogger _logger = LogManager.ForContext<BuildVisionPaneViewModel>();
 
 #if MARKETPLACE
-        public const string PreviewVersion = "false";
+        public const bool PreviewVersion = false;
 #else
-        public const string PreviewVersion = "true";
+        public const bool PreviewVersion = true;
 #endif
 
         public ISolutionModel SolutionModel { get; set; }

diff --git a/src/BuildVision/BuildVision.csproj b/src/BuildVision/BuildVision.csproj
@@ -263,7 +263,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Marketplace|AnyCPU'">
     <OutputPath>bin\Marketplace\</OutputPath>
-    <DefineConstants>CODE_ANALYSIS;TRACE</DefineConstants>
+    <DefineConstants>TRACE;CODE_ANALYSIS;CODE_ANALYSIS;MARKETPLACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>