Merge branch 'dev'

winbench · Apr 17, 2023 · 9b875ce · 9b875ce
2 parents a43df6d + 46bbc47
commit 9b875ce
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 18 deletions.
diff --git a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.5.0")]
-[assembly: AssemblyFileVersion("0.22.5.0")]
+[assembly: AssemblyVersion("0.22.6.0")]
+[assembly: AssemblyFileVersion("0.22.6.0")]
diff --git a/BenchManager/BenchDashboard/AppLauncherControl.cs b/BenchManager/BenchDashboard/AppLauncherControl.cs
@@ -52,7 +52,7 @@ private void BindAppIndex()
             icons32.Images.Clear();
             listView.Items.Clear();
             var items = from app in appIndex.ActiveApps
-                        where app.Launcher != null
+                        where !string.IsNullOrWhiteSpace(app.Launcher)
                         select AppItem(app);
             listView.Items.AddRange(items.ToArray());
             if (Visible) LoadIconImages();

diff --git a/BenchManager/BenchDashboard/BenchDashboard.csproj b/BenchManager/BenchDashboard/BenchDashboard.csproj
@@ -330,7 +330,7 @@
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.8.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.8.2\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\packages\ConEmu.Core.18.6.26\build\ConEmu.Core.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ConEmu.Core.18.6.26\build\ConEmu.Core.Targets'))" />
   </Target>
   <PropertyGroup>

diff --git a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.5.0")]
-[assembly: AssemblyFileVersion("0.22.5.0")]
+[assembly: AssemblyVersion("0.22.6.0")]
+[assembly: AssemblyFileVersion("0.22.6.0")]
diff --git a/BenchManager/BenchLib.Test/BenchLib.Test.csproj b/BenchManager/BenchLib.Test/BenchLib.Test.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
-  <Import Project="..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props')" />
+  <Import Project="..\packages\Microsoft.Net.Compilers.2.8.2\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.8.2\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -69,7 +69,7 @@
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.8.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.8.2\build\Microsoft.Net.Compilers.props'))" />
     <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/BenchManager/BenchLib/BenchLib.csproj b/BenchManager/BenchLib/BenchLib.csproj
@@ -256,7 +256,7 @@
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.3.2\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.8.2\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.8.2\build\Microsoft.Net.Compilers.props'))" />
   </Target>
   <PropertyGroup>
     <PostBuildEvent>copy "$(TargetPath)" "$(SolutionDir)..\auto\bin\$(TargetFileName)"</PostBuildEvent>

diff --git a/BenchManager/BenchLib/BenchTasks.cs b/BenchManager/BenchLib/BenchTasks.cs
@@ -1750,7 +1750,7 @@ private static void CreateActionLaunchers(BenchConfiguration config)
         private static void CreateLauncher(BenchConfiguration config, AppFacade app)
         {
             var label = app.Launcher;
-            if (label == null) return;
+            if (string.IsNullOrWhiteSpace(label)) return;
 
             var executable = app.LauncherExecutable;
             var args = CommandLine.FormatArgumentList(app.LauncherArguments);

diff --git a/BenchManager/BenchLib/Properties/AssemblyInfo.cs b/BenchManager/BenchLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.5.0")]
-[assembly: AssemblyFileVersion("0.22.5.0")]
+[assembly: AssemblyVersion("0.22.6.0")]
+[assembly: AssemblyFileVersion("0.22.6.0")]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,13 @@ Add a link to the GitHub diff like
 
 [Unreleased]: https://github.com/winbench/bench/compare/master...dev
 
+## [0.22.6] - 2023-04-17
+
+[0.22.6]: https://github.com/winbench/bench/compare/v0.22.5...v0.22.6
+
+### Changed
+* Hide or suppress launcher if `Launcher` app property is empty
+
 ## [0.22.5] - 2023-03-30
 
 [0.22.5]: https://github.com/winbench/bench/compare/v0.22.4...v0.22.5

diff --git a/build/build.ps1 b/build/build.ps1
@@ -4,7 +4,7 @@ param (
     [switch]$NoRelease
 )
 
-$myDir = [IO.Path]::GetDirectoryName($MyInvocation.MyCommand.Definition)
+$myDir = $PSScriptRoot
 $rootDir = [IO.Path]::GetDirectoryName($myDir)
 pushd
 
@@ -39,6 +39,9 @@ $releaseDir = "$rootDir\release" # absolute
 $releaseFileName = "$projectName"
 $stageDir = "$releaseDir\staging" # absolute
 
+# Allow TLS 1.1 and 1.2 in downloads
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]'Tls11,Tls12'
+
 if (!$msbuild) {
     Write-Warning "Could not find MSBuild"
     Write-Host "Searched for MSBuild at"
@@ -50,7 +53,7 @@ if (!$msbuild) {
     Write-Host "Using MSBuild at: $msbuild"
 }
 
-$projects = @("BenchLib", "BenchCLI", "BenchDashboard")
+$projects = @("BenchLib", "BenchLib.Test", "BenchCLI", "BenchDashboard")
 
 # Paths of build artifacts are relative to the solution dir
 $buildArtifacts = @(

diff --git a/build/prepare-project-compiler.ps1 b/build/prepare-project-compiler.ps1
@@ -9,7 +9,7 @@ param (
   $SourceDir = "..\src"
 )
 
-$thisDir = Split-Path $MyInvocation.MyCommand.Path -Parent
+$thisDir = $PSScriptRoot
 $sourceDir = Resolve-Path "$thisDir\$SourceDir"
 
 [string[]]$projects = $Projects
@@ -105,6 +105,27 @@ function prepareProject($name, $toolsVersion, $langVersion)
     $import.SetAttribute("Project", $packagePath)
     $import.SetAttribute("Condition", "Exists('${packagePath}')")
 
+    [Xml.XmlElement]$ensureTarget = $null
+    foreach ($i in $p.SelectNodes("msb:Target", $nsMgr))
+    {
+        if ($i.GetAttribute("Name") -eq "EnsureNuGetPackageBuildImports") {
+            $ensureTarget = $i
+            break
+        }
+    }
+    if ($ensureTarget) {
+        [Xml.XmlElement]$targetError
+        foreach ($e in $ensureTarget.SelectNodes("msb:Error", $nsMgr)) {
+            if ($e.GetAttribute("Condition") -like "*Microsoft.Net.Compilers*") {
+                $targetError = $e
+                $targetError.SetAttribute("Condition", $($targetError.GetAttribute("Condition") `
+                    -replace '\\Microsoft\.Net\.Compilers\.[.\d]+\\',"\Microsoft.Net.Compilers.${CompilerPackageVersion}\"))
+                $targetError.SetAttribute("Text", $($targetError.GetAttribute("Text") `
+                    -replace '\\Microsoft\.Net\.Compilers\.[.\d]+\\',"\Microsoft.Net.Compilers.${CompilerPackageVersion}\"))
+            }
+        }
+    }
+
     echo "Setting language version in $name to $langVersion"
     foreach ($pt in $p.SelectNodes("msb:PropertyGroup/msb:PlatformTarget", $nsMgr))
     {

diff --git a/res/bench-install.bat b/res/bench-install.bat
@@ -7,7 +7,7 @@ SetLocal
 :: https://winbench.org/guide/setup/
 ::
 
-SET VERSION=0.22.5
+SET VERSION=0.22.6
 SET TAG=v%VERSION%
 SET ROOT=%~dp0
 IF [%1] NEQ [] SET ROOT=%~dpnx1\

diff --git a/res/version.txt b/res/version.txt
@@ -1 +1 @@
-0.22.5
+0.22.6