CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-05-16 02:13:39 +12:00
Code Issues Projects Releases Wiki Activity

[Bug] Fix Pipeline error NETSDK1047 #108

Browse source
This commit is contained in:
Markus Hofknecht 2020-06-21 12:52:37 +02:00
parent 721256bfcb
commit 6de2a3b1d0
4 changed files with 103 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Packaging/Packaging.wapproj
View file

@ -4,30 +4,42 @@
<VisualStudioVersion>15.0</VisualStudioVersion>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x86">
<ProjectConfiguration Include="Debug|AnyCPU">
<Configuration>Debug</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x86">
<Configuration>Release</Configuration>
<Platform>x86</Platform>
<Platform>AnyCPU</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<ProjectConfiguration Include="Debug|x86">
<Configuration>Debug</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleasePackage|AnyCPU">
<Configuration>ReleasePackage</Configuration>
<Platform>AnyCPU</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleasePackage|x64">
<Configuration>ReleasePackage</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|AnyCPU">
<Configuration>Debug</Configuration>
<Platform>AnyCPU</Platform>
<ProjectConfiguration Include="ReleasePackage|x86">
<Configuration>ReleasePackage</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|AnyCPU">
<Configuration>Release</Configuration>
<Platform>AnyCPU</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x86">
<Configuration>Release</Configuration>
<Platform>x86</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup>
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
@ -47,24 +59,33 @@
<AppInstallerUri>https://github.com/Hofknecht/SystemTrayMenu/releases</AppInstallerUri>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePackage|x64'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePackage|AnyCPU'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePackage|x86'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<AppxBundle>Always</AppxBundle>
</PropertyGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>

62
SystemTrayMenu.csproj
View file

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
<UseWindowsForms>true</UseWindowsForms>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU;x86;x64</Platform>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<OutputType>WinExe</OutputType>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
@ -21,7 +21,8 @@
<UseApplicationTrust>true</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<Platforms>AnyCPU;x86;x64</Platforms>
<Platforms>x64;x86;AnyCPU</Platforms>
<Configurations>Debug;Release;ReleasePackage</Configurations>
</PropertyGroup>
<PropertyGroup>
<StartupObject>SystemTrayMenu.Program</StartupObject>
@ -29,12 +30,15 @@
<PropertyGroup>
<ApplicationIcon>Resources\SystemTrayMenu.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'x64|x86'">
<OutputPath>bin\x86\x64\</OutputPath>
<Optimize>true</Optimize>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<OutputPath>bin\x64\Debug\</OutputPath>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>bin\x64\Debug\</OutputPath>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<OutputPath>bin\x64\Debug\</OutputPath>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
@ -42,16 +46,39 @@
<OutputPath>bin\x64\Release\</OutputPath>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'x64|x64'">
<OutputPath>bin\x64\x64\</OutputPath>
<Optimize>true</Optimize>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>bin\x64\Release\</OutputPath>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePackage|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePackage|AnyCPU'">
<OutputPath>bin\x64\Release\</OutputPath>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<OutputPath>bin\x64\Release\</OutputPath>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePackage|x86'">
<OutputPath>bin\x64\Release\</OutputPath>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ErrorReport>none</ErrorReport>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<ErrorReport>none</ErrorReport>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePackage|x64'">
<ErrorReport>none</ErrorReport>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePackage|AnyCPU'">
<ErrorReport>none</ErrorReport>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
@ -59,14 +86,9 @@
<ErrorReport>none</ErrorReport>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'x64|AnyCPU'">
<OutputPath>bin\x64\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64|x64'">
<OutputPath>bin\x64\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='x64|x86'">
<OutputPath>bin\x64\</OutputPath>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePackage|x86'">
<ErrorReport>none</ErrorReport>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="Clearcove.Logging, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

30
SystemTrayMenu.sln
View file

@ -25,26 +25,44 @@ Global
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
ReleasePackage|Any CPU = ReleasePackage|Any CPU
ReleasePackage|x64 = ReleasePackage|x64
ReleasePackage|x86 = ReleasePackage|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Debug|x64.ActiveCfg = Debug|x64
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Debug|x64.Build.0 = Debug|x64
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Debug|x86.ActiveCfg = Debug|x64
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Debug|x86.Build.0 = Debug|x64
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Release|Any CPU.ActiveCfg = Release|x86
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Release|Any CPU.Build.0 = Release|x86
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Debug|x86.ActiveCfg = Debug|x86
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Debug|x86.Build.0 = Debug|x86
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Release|Any CPU.Build.0 = Release|Any CPU
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Release|x64.ActiveCfg = Release|x64
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Release|x64.Build.0 = Release|x64
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Release|x86.ActiveCfg = Release|x86
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.Release|x86.Build.0 = Release|x86
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.ReleasePackage|Any CPU.ActiveCfg = ReleasePackage|Any CPU
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.ReleasePackage|Any CPU.Build.0 = ReleasePackage|Any CPU
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.ReleasePackage|x64.ActiveCfg = ReleasePackage|x64
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.ReleasePackage|x64.Build.0 = ReleasePackage|x64
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.ReleasePackage|x86.ActiveCfg = ReleasePackage|x86
{F317AF2E-9704-4A2A-BDAE-B4662ED9483B}.ReleasePackage|x86.Build.0 = ReleasePackage|x86
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.Debug|x64.ActiveCfg = Debug|x64
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.Debug|x86.ActiveCfg = Debug|x64
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.Release|Any CPU.ActiveCfg = Release|x86
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.Debug|x86.ActiveCfg = Debug|x86
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.Release|x64.ActiveCfg = Release|x64
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.Release|x86.ActiveCfg = Release|x86
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.ReleasePackage|Any CPU.ActiveCfg = ReleasePackage|Any CPU
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.ReleasePackage|Any CPU.Build.0 = ReleasePackage|Any CPU
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.ReleasePackage|Any CPU.Deploy.0 = ReleasePackage|Any CPU
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.ReleasePackage|x64.ActiveCfg = ReleasePackage|x64
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.ReleasePackage|x64.Build.0 = ReleasePackage|x64
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.ReleasePackage|x64.Deploy.0 = ReleasePackage|x64
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.ReleasePackage|x86.ActiveCfg = ReleasePackage|x86
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.ReleasePackage|x86.Build.0 = ReleasePackage|x86
{01D77F37-786A-4DC4-A1AD-BC1EEC54EAE3}.ReleasePackage|x86.Deploy.0 = ReleasePackage|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

4
azure-pipelines.yml
View file

@ -64,7 +64,7 @@ steps:
displayName: 'MSBuild'
inputs:
solution: '**/*.sln'
msbuildArguments: '-p:Configuration=Release -p:Platform="Any CPU"'
msbuildArguments: '-p:Configuration=Release -p:Platform=x64'
#- task: CopyFiles@2
# displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
@ -80,7 +80,7 @@ steps:
- task: ArchiveFiles@2
displayName: 'Archive $(Build.ArtifactStagingDirectory)'
inputs:
rootFolderOrFile: '$(Build.SourcesDirectory)\bin\Any CPU\Release\netcoreapp3.1\'
rootFolderOrFile: '$(Build.SourcesDirectory)\bin\x64\Release\netcoreapp3.1\'
includeRootFolder: false
archiveFile: '$(Build.ArtifactStagingDirectory)/SystemTrayMenu-$(AssemblyInfo.AssemblyVersion).zip'