Merge branch 'master' of https://github.com/icsharpcode/WpfDesigner into feature/net5

Author: jogibear9988

README.md

@@ -9,7 +9,7 @@ WpfDesigner is a set of assemblies which can be included in your project to impl
 
 Branch | Status
 --- | ---
-*master* (Development) | [![Build status](https://ci.appveyor.com/api/projects/status/iqxeo16r8ff9qv66/branch/master?svg=true)](https://ci.appveyor.com/project/icsharpcode/WpfDesigner/branch/master) 
+*master* (Development) | [![Build Status](https://icsharpcode.visualstudio.com/icsharpcode-pipelines/_apis/build/status/icsharpcode.WpfDesigner?branchName=master)](https://icsharpcode.visualstudio.com/icsharpcode-pipelines/_build/latest?definitionId=4&branchName=master)
 
 
 ## System Requirements

appveyor.yml

@@ -6,7 +6,7 @@
 
   image: Visual Studio 2019
 
-  configuration: Debug
+  configuration: Release
 
   assembly_info:
     patch: true
@@ -25,7 +25,7 @@
     - ps: .\nuget\pack.ps1
 
   test_script:
-    - cmd: nunit3-console WpfDesign.Designer\Tests\bin\Debug\net45\ICSharpCode.WpfDesign.Tests.dll --framework:net-4.5 --result=myresults.xml;format=AppVeyor
+    - cmd: nunit3-console WpfDesign.Designer\Tests\bin\Release\net45\ICSharpCode.WpfDesign.Tests.dll --framework:net-4.5 --result=myresults.xml;format=AppVeyor
 
   artifacts:
     - path: 'ICSharpCode.WpfDesigner.*.nupkg'

azure-pipelines.yml

@@ -0,0 +1,67 @@
+trigger:
+- master
+
+pr:
+- master
+
+variables:
+  solution: '**/WpfDesign.sln'
+  buildPlatform: 'Any CPU'
+  buildVersion: '8.0.$(Build.BuildId)'
+
+pool:
+  vmImage: 'windows-2019'
+strategy:
+  matrix:
+    Config_Release:
+        buildConfiguration: 'Release'
+    Config_Debug:
+        buildConfiguration: 'Debug'
+
+steps:
+- task: NuGetToolInstaller@1
+
+- task: NuGetCommand@2
+  inputs:
+    restoreSolution: '$(solution)'
+
+- task: Assembly-Info-NetFramework@2
+  inputs:
+    Path: '$(Build.SourcesDirectory)'
+    FileNames: '**\GlobalAssemblyInfo.*'
+    InsertAttributes: false
+    FileEncoding: 'auto'
+    WriteBOM: false
+    VersionNumber: '$(buildVersion)'
+    FileVersionNumber: '$(buildVersion)'
+    InformationalVersion: '$(buildVersion)'
+
+- task: VSBuild@1
+  inputs:
+    solution: '$(solution)'
+    msbuildArgs: ''
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+- task: VSTest@2
+  inputs:
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+- powershell: .\nuget\pack.ps1
+  displayName: Pack
+  condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'))
+
+- task: CopyFiles@2
+  displayName: Move to publish directory
+  inputs:
+    contents: |
+      **\*.nupkg
+    targetFolder: $(Build.ArtifactStagingDirectory)
+  condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'))
+
+- task: PublishPipelineArtifact@0
+  displayName: Publish $(BuildConfiguration)
+  inputs:
+    targetPath: $(Build.ArtifactStagingDirectory)
+  condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'))

nuget/WpfDesigner.ExpressionBlendInteractionAddon.nuspec

@@ -16,7 +16,7 @@
 	<tags>WPF XAML Designer UI Editor SharpDevelop WpfDesigner</tags>
   </metadata>
   <files>
-    <file src="..\WpfDesign.Design.ExpressionBlendInteractionAddon\bin\Debug\net45\ICSharpCode.WpfDesign.Designer.ExpressionBlendInteractionAddon.dll" target="lib\net45" />
-    <file src="..\WpfDesign.Design.ExpressionBlendInteractionAddon\bin\Debug\net45\ICSharpCode.WpfDesign.Designer.ExpressionBlendInteractionAddon.pdb" target="lib\net45" />	
+    <file src="..\WpfDesign.Design.ExpressionBlendInteractionAddon\bin\Release\net45\ICSharpCode.WpfDesign.Designer.ExpressionBlendInteractionAddon.dll" target="lib\net45" />
+    <file src="..\WpfDesign.Design.ExpressionBlendInteractionAddon\bin\Release\net45\ICSharpCode.WpfDesign.Designer.ExpressionBlendInteractionAddon.pdb" target="lib\net45" />	
   </files>
 </package>

nuget/WpfDesigner.nuspec

@@ -6,7 +6,7 @@
 	<title>WPF Designer</title>
     <authors>IC#Code</authors>
     <owners>IC#Code</owners>
-    <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>https://github.com/icsharpcode/WpfDesigner</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A Designer Framework for WPF UIs</description>