test version 10

byCrookie · Feb 22, 2023 · f33014b · f33014b
1 parent 798961a
commit f33014b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <MajorVersion>1</MajorVersion>
         <MinorVersion>1</MinorVersion>
-        <PatchVersion>9</PatchVersion>
+        <PatchVersion>10</PatchVersion>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/src/TypeCode.Wpf.Setup/Product.wxs b/src/TypeCode.Wpf.Setup/Product.wxs
@@ -5,20 +5,22 @@
     <Product Id="*"
              Name="TypeCode"
              Language="1033"
-             Version="1.0.0.0"
+             Version="$(var.ProductVersion)"
              Manufacturer="byCrookie"
              UpgradeCode="9f57777b-619a-41c8-afec-d7f7412d4047">
 
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perUser"/>
 
-        <MajorUpgrade AllowDowngrades="yes"/>
+        <MajorUpgrade
+                AllowDowngrades="no" DowngradeErrorMessage="!(loc.NewerVersionInstalled)"
+                AllowSameVersionUpgrades="yes"/>
 
         <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes"/>
         <Upgrade Id="9f57777b-619a-41c8-afec-d7f7412d4047">
             <UpgradeVersion
-                    Minimum="1.0.0.0" Maximum="1.0.0.0"
+                    Minimum="1.0.0.0" Maximum="99.0.0.0"
                     Property="PREVIOUSVERSIONSINSTALLED"
-                    IncludeMinimum="yes" IncludeMaximum="yes"/>
+                    IncludeMinimum="yes" IncludeMaximum="no"/>
         </Upgrade>
 
         <!--        <InstallExecuteSequence>-->

diff --git a/src/TypeCode.Wpf.Setup/TypeCode.Wpf.Setup.wixproj b/src/TypeCode.Wpf.Setup/TypeCode.Wpf.Setup.wixproj
@@ -4,7 +4,7 @@
     <PropertyGroup>
         <WixToolPath>wix</WixToolPath>
         <WixTargetsPath>$(WixToolPath)\wix.targets</WixTargetsPath>
-        <DefineConstants>BasePath=..\TypeCode.Wpf.Setup\bin\publish\$(Configuration)</DefineConstants>
+        <DefineConstants>BasePath=..\TypeCode.Wpf.Setup\bin\publish\$(Configuration),ProductVersion=$(MajorVersion).$(MinorVersion).$(PatchVersion).0</DefineConstants>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -27,18 +27,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="byCrookie.LibrarySdk" />
+        <PackageReference Include="byCrookie.LibrarySdk"/>
     </ItemGroup>
 
     <ItemGroup>
-        <Compile Include="Product.wxs" />
-        <Compile Include="Binaries.wxs" />
-        <Content Include="DownloadAndExtractWix.ps1" />
-        <Content Include="Assets\Banner.bmp" />
-        <Content Include="Assets\Banner.xcf" />
-        <Content Include="Assets\Dialog.bmp" />
-        <Content Include="Assets\Dialog.xcf" />
-        <Content Include="Assets\License.rtf" />
+        <Compile Include="Product.wxs"/>
+        <Compile Include="Binaries.wxs"/>
+        <Content Include="DownloadAndExtractWix.ps1"/>
+        <Content Include="Assets\Banner.bmp"/>
+        <Content Include="Assets\Banner.xcf"/>
+        <Content Include="Assets\Dialog.bmp"/>
+        <Content Include="Assets\Dialog.xcf"/>
+        <Content Include="Assets\License.rtf"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -52,10 +52,10 @@
         </ProjectReference>
     </ItemGroup>
 
-    <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+    <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' "/>
+    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') "/>
     <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-        <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+        <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/"/>
     </Target>
 
     <ItemGroup>
@@ -70,15 +70,16 @@
     </ItemGroup>
 
     <Target Name="BeforeBuild">
-        <Exec Command="rd /s /q ..\TypeCode.Wpf.Setup\bin\publish\$(Configuration)" />
-        <Exec Command="dotnet publish ..\TypeCode.Wpf\TypeCode.Wpf.csproj -c $(Configuration) -o bin\publish\$(Configuration)" />
+
+        <Exec Command="rd /s /q ..\TypeCode.Wpf.Setup\bin\publish\$(Configuration)"/>
+        <Exec Command="dotnet publish ..\TypeCode.Wpf\TypeCode.Wpf.csproj -c $(Configuration) -o bin\publish\$(Configuration)"/>
 
         <HeatDirectory OutputFile="Binaries.wxs" DirectoryRefId="APPLICATIONFOLDER"
                        ComponentGroupName="Binaries" SuppressCom="true"
                        Directory="..\TypeCode.Wpf.Setup\bin\publish\$(Configuration)"
                        SuppressFragments="true" SuppressRegistry="true"
                        SuppressRootDirectory="true" AutoGenerateGuids="false"
                        GenerateGuidsNow="true" ToolPath="$(WixToolPath)"
-                       PreprocessorVariable="var.BasePath" />
+                       PreprocessorVariable="var.BasePath"/>
     </Target>
 </Project>