diff --git a/SystemTrayMenu.csproj b/SystemTrayMenu.csproj
index 72ee098..a3f9408 100644
--- a/SystemTrayMenu.csproj
+++ b/SystemTrayMenu.csproj
@@ -57,8 +57,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>ThirdParty\Clearcove.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Windows.Forms" />
     <Reference Include="TAFactory.IconPack, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>ThirdParty\TAFactory.IconPack.dll</HintPath>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5fc9853..3066b6c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -35,34 +35,40 @@ steps:
     restoreSolution: '$(solution)'
     feedsToUse: config
 
-- 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: 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' 
 
-- task: CmdLine@2
-  displayName: Rename single-exe x64
+- task: MSBuild@1
+  displayName: 'MSBuild'
   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' 
-
+    solution: '**/*.sln'
+    msbuildArguments: '-p:Configuration=Release'
+    
 - task: CopyFiles@2
   displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
   inputs: