Fixed builds

Terminals-Origin · Aug 31, 2023 · 0d13894 · 0d13894
1 parent 67b22eb
commit 0d13894
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/Build/Build.ps1 b/Build/Build.ps1
@@ -20,7 +20,7 @@ if (-Not $(Test-Path $msbuild)) {
 $solutionFile = "..\Source\Terminals.sln";
 dotnet restore $solutionFile  # already expecting new dotnet installed with Visual studio
 # Compile the solution - the distributionrelease configuration contains installer, which is not normal configurations
-& "$msbuild" $solutionFile /m /p:configuration=DistributionRelease /p:Platform='Mixed Platforms' /t:rebuild -restore | Tee-Object $logFile -Append;
+& "$msbuild" $solutionFile /m /p:configuration=DistributionRelease /p:Platform='Mixed Platforms' /t:rebuild -restore /verbosity:diag | Tee-Object $logFile -Append;
 
 .\PackOutput.ps1 | Tee-Object $logFile -Append;
 

diff --git a/Source/Terminals/Properties/Common.AssemblyInfo.cs b/Source/Terminals/Properties/Common.AssemblyInfo.cs
@@ -6,4 +6,4 @@
 [assembly: AssemblyCompany("Robert Chartier")]
 [assembly: AssemblyProduct("Terminals by Robert Chartier")]
 [assembly: AssemblyCopyright("Copyright © by Robert Chartier 2006 - 2023")]
-[assembly: AssemblyVersion("4.0.1.*")]
+[assembly: AssemblyVersion("5.0.0.*")]
diff --git a/Source/Terminals/Terminals.csproj b/Source/Terminals/Terminals.csproj
@@ -24,7 +24,12 @@
     <PackageReference Include="System.Memory" />
     <PackageReference Include="System.Numerics.Vectors" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" GeneratePathProperty="true" ExcludeAssets="Compile;Runtime;Build" />
+
+    <!-- Hack https://github.com/dotnet/sdk/issues/1791 to enforce nestandard version -->
+    <Reference Include="System.Threading.Tasks.Extensions">
+      <HintPath>$(PkgSystem_Threading_Tasks_Extensions)\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
 
     <Reference Include="AWSSDK, Version=1.3.10.0, Culture=neutral, PublicKeyToken=cd2d24cd2bace800, processorArchitecture=MSIL">
       <HintPath>..\..\Resources\Libraries\AmazonS3\AWSSDK.dll</HintPath>

diff --git a/Source/TerminalsSetup/Product.wxs b/Source/TerminalsSetup/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <!--to make new release change all product id, package id and version number-->
-  <Product Id="*" Name="Terminals" Language="1033" Version="4.0.1.0" Manufacturer="Robert Chartier"
+  <Product Id="*" Name="Terminals" Language="1033" Version="5.0.0.0" Manufacturer="Robert Chartier"
            UpgradeCode="DD0D31A2-2E86-4F3F-98CE-6AED37FF24CD">
     <Package Id="*" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of Terminals is already installed." />

diff --git a/Source/Tests/Tests.csproj b/Source/Tests/Tests.csproj
@@ -18,7 +18,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-	<PackageReference Include="System.Threading.Tasks.Extensions" />
+	<PackageReference Include="System.Threading.Tasks.Extensions" GeneratePathProperty="true" ExcludeAssets="Compile;Runtime;Build" />
+    <!-- Hack https://github.com/dotnet/sdk/issues/1791 to enforce nestandard version -->
+    <Reference Include="System.Threading.Tasks.Extensions">
+      <HintPath>$(PkgSystem_Threading_Tasks_Extensions)\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+
 	<PackageReference Include="System.Memory" />
     <PackageReference Include="System.Numerics.Vectors" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />