diff --git a/Packaging/Package.appxmanifest b/Packaging/Package.appxmanifest index ef50efb..b6dc1c6 100644 --- a/Packaging/Package.appxmanifest +++ b/Packaging/Package.appxmanifest @@ -10,7 +10,7 @@ + Version="1.3.3.0" /> SystemTrayMenu diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index d2b3ec3..fff0ce9 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ using System.Runtime.InteropServices; // 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("1.3.2.10")] -[assembly: AssemblyFileVersion("1.3.2.10")] +[assembly: AssemblyVersion("1.3.3.0")] +[assembly: AssemblyFileVersion("1.3.3.0")] diff --git a/SystemTrayMenu.csproj b/SystemTrayMenu.csproj index 953d662..64d6659 100644 --- a/SystemTrayMenu.csproj +++ b/SystemTrayMenu.csproj @@ -1,6 +1,7 @@  net6.0-windows10.0.22000.0 + true win-x64 true x64 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6ffab99..896aa60 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -8,7 +8,6 @@ trigger: pool: vmImage: 'Windows-latest' -# vmImage: 'Windows-2019' variables: solution: '**/*.sln' @@ -19,51 +18,15 @@ steps: - task: NuGetToolInstaller@1 - task: UseDotNet@2 - displayName: 'Use .NET Core sdk' inputs: packageType: sdk version: 6.0.x -# version: 3.1.102 - -#- task: NuGetCommand@2 -# displayName: NuGet restore -# inputs: -# restoreSolution: '$(solution)' -# feedsToUse: config - task: DotNetCoreCLI@2 inputs: command: 'restore' projects: '$(solution)' - feedsToUse: 'select' - -#- task: DotNetCoreCLI@2 -# displayName: Publish single-exe x64 -# inputs: -# command: 'publish' -# publishWebProjects: false -# projects: 'SystemTrayMenu.csproj' -# arguments: '-f netcoreapp3.1 -c Release /p:PublishSingleFile=true /p:RuntimeIdentifier=win-x64' -# zipAfterPublish: false -# -#- task: CmdLine@2 -# displayName: Rename single-exe x64 -# inputs: -# script: 'rename $(Build.SourcesDirectory)\bin\Release\netcoreapp3.1\win-x64\publish\SystemTrayMenu.exe SystemTrayMenu-x64.exe'# -# -#- task: DotNetCoreCLI@2 -# displayName: Publish single-exe x86 -# inputs: -# command: 'publish' -# publishWebProjects: false -# projects: 'SystemTrayMenu.csproj' -# arguments: '-f netcoreapp3.1 -c Release /p:PublishSingleFile=true /p:RuntimeIdentifier=win-x86' -# zipAfterPublish: false -# -#- task: CmdLine@2 -# displayName: Rename single-exe x86 -# inputs: -# script: 'rename $(Build.SourcesDirectory)\bin\Release\netcoreapp3.1\win-x86\publish\SystemTrayMenu.exe SystemTrayMenu-x86.exe' + feedsToUse: 'select' - task: kherzog.AssemblyInfoReader.assembly-info-reader-build-task.AssembyInfoReader@2 displayName: 'Generate variables **\AssemblyInfo.cs ' @@ -73,27 +36,11 @@ steps: inputs: solution: '**/*.sln' msbuildArguments: '-p:Configuration=Release -p:Platform="Any CPU"' -# msbuildArguments: '-p:Configuration=Release -p:Platform=x64' -# msbuildArguments: '-p:Configuration=Release -p:Platform=x86' - -#- task: CopyFiles@2 -# displayName: 'Copy Files to: $(build.artifactstagingdirectory)' -# inputs: -# SourceFolder: '$(Build.SourcesDirectory)\bin\Release\netcoreapp3.1' -## Contents: ** -## Contents: | -## win-x64\publish\SystemTrayMenu-x64.exe -## win-x86\publish\SystemTrayMenu-x86.exe -# TargetFolder: '$(build.artifactstagingdirectory)' -# flattenFolders: true - task: ArchiveFiles@2 displayName: 'Archive $(Build.ArtifactStagingDirectory)' inputs: - rootFolderOrFile: '$(Build.SourcesDirectory)\bin\AnyCPU\Release\net6.0-windows10.0.22000.0\' -# rootFolderOrFile: '$(Build.SourcesDirectory)\bin\AnyCPU\Release\netcoreapp3.1\' -# rootFolderOrFile: '$(Build.SourcesDirectory)\bin\x64\Release\netcoreapp3.1\' -# rootFolderOrFile: '$(Build.SourcesDirectory)\bin\x86\Release\netcoreapp3.1\' + rootFolderOrFile: '$(Build.SourcesDirectory)\bin\AnyCPU\Release\net6.0-windows10.0.22000.0\publish\win-x64\' includeRootFolder: false archiveFile: '$(Build.ArtifactStagingDirectory)/SystemTrayMenu-$(AssemblyInfo.AssemblyVersion).zip'