Modernize build pipeline

tom-englert · Jul 27, 2024 · f43e51c · f43e51c
1 parent 142e73f
commit f43e51c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 39 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -2,61 +2,51 @@ name: $(Build.DefinitionName) $(date:yyyyMMdd)$(rev:.r)
 
 pool:
   vmImage: 'windows-2022'
-  demands:
-  - msbuild
-  - vstest
+
+workspace:
+  clean: all  
 
 variables:
   BuildPlatform: 'Any CPU'
   BuildConfiguration: 'Release'
   Solution: 'src\TomsToolbox.sln'
 
 steps:
-- task: DeleteFiles@1
-  displayName: 'Delete files from Deploy'
+- task: UseDotNex
+  displayName: 'Install DotNet Sdk
   inputs:
-    Contents: 'Deploy/**'
+    version: 8.0.x
 
-- task: NuGetToolInstaller@1
-  inputs:
-    versionSpec: 
+- script: dotnet --info
+  displayName: 'Log DotNet version'
 
-- task: NuGetCommand@2
-  displayName: 'NuGet restore'
+- task: DotNetCoreCLI@2
+  displayName: 'Restore Solution'
   inputs:
-    command: 'restore'
-    restoreSolution: '$(Solution)'
+    command: restore
+    projects: $(Solution)
 
-- task: MSBuild@1
+- task: DotNetCoreCLI@2
   displayName: 'Build Solution'
   inputs:
-    solution: '$(Solution)'
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    clean: true
+    command: build
+    projects: $(Solution)
+    arguments: '--configuration $(BuildConfiguration) --no-restore'
 
-- task: MSBuild@1
+- task: DotNetCoreCLI@2
   displayName: 'Publish Sample App'
   inputs:
-    solution: 'src\SampleApp.Ninject\SampleApp.Ninject.csproj'
-    platform: AnyCPU
-    configuration: release
-    msbuildArguments: '/target:publish'
-    logProjectEvents: true
-    createLogFile: true
+    command: publish
+    projects: 'src\SampleApp.Ninject\SampleApp.Ninject.csproj'
+    arguments: '--configuration $(BuildConfiguration) --no-build'
   condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
 
-- task: VSTest@2
-  displayName: 'Test Assemblies **\$(BuildConfiguration)\*tests.dll;-:**\obj\**'
+- task: DotNetCoreCLI@2
+  displayName: 'Run Testst'
   inputs:
-    testAssemblyVer2: |
-     **\*tests.dll
-     !**\obj\**
-    runInParallel: false
-    codeCoverageEnabled: false
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    diagnosticsEnabled: false
+    command: test
+    projects: $(Solution)
+    arguments: '--configuration $(BuildConfiguration) --no-build'
 
 - task: CopyFiles@2
   displayName: 'Copy Files to: $(build.artifactstagingdirectory)/Packages'

diff --git a/src/TomsToolbox.Wpf/TomsToolbox.Wpf.ExternalAnnotations.xml b/src/TomsToolbox.Wpf/TomsToolbox.Wpf.ExternalAnnotations.xml
@@ -9,16 +9,16 @@
   <member name="M:TomsToolbox.Wpf.ObservableObjectBase.SetProperty``1(``0@,``0,System.Action{``0,``0},System.String)">
     <attribute ctor="M:JetBrains.Annotations.NotifyPropertyChangedInvocatorAttribute.#ctor" />
   </member>
-  <member name="M:TomsToolbox.Wpf.ObservableObjectBase.SetProperty``1(``0@,``0,System.Linq.Expressions.Expression{System.Func{``0}})">
-    <attribute ctor="M:JetBrains.Annotations.NotifyPropertyChangedInvocatorAttribute.#ctor" />
-  </member>
   <member name="M:TomsToolbox.Wpf.ObservableObjectBase.SetProperty``1(``0@,``0,System.Linq.Expressions.Expression{System.Func{``0}},System.Action{``0,``0})">
     <attribute ctor="M:JetBrains.Annotations.NotifyPropertyChangedInvocatorAttribute.#ctor" />
   </member>
-  <member name="M:TomsToolbox.Wpf.ObservableObjectBase.SetProperty``1(``0@,``0,System.String)">
+  <member name="M:TomsToolbox.Wpf.ObservableObjectBase.SetProperty``1(``0@,``0,System.Linq.Expressions.Expression{System.Func{``0}})">
     <attribute ctor="M:JetBrains.Annotations.NotifyPropertyChangedInvocatorAttribute.#ctor" />
   </member>
   <member name="M:TomsToolbox.Wpf.ObservableObjectBase.SetProperty``1(``0@,``0,System.String,System.Action{``0,``0})">
     <attribute ctor="M:JetBrains.Annotations.NotifyPropertyChangedInvocatorAttribute.#ctor" />
   </member>
+  <member name="M:TomsToolbox.Wpf.ObservableObjectBase.SetProperty``1(``0@,``0,System.String)">
+    <attribute ctor="M:JetBrains.Annotations.NotifyPropertyChangedInvocatorAttribute.#ctor" />
+  </member>
 </assembly>