Build packages automatically in CI builds

Author: kzu

azure-pipelines.yml

@@ -46,7 +46,7 @@ stages:
       inputs:
         version: $(DotNetVersion)
         performMultiLevelLookup: true
-    - script: 'dotnet tool update -g dotnet-format && dotnet format -w $(Build.SourcesDirectory) --dry-run --check -v:diag'
+    - script: 'dotnet tool update -g dotnet-format && dotnet format -f $(Build.SourcesDirectory)\src --dry-run --check -v:diag'
       displayName: Check .editorconfig compliance
     - template: dump-environment.yml@templates
 

build.proj

@@ -12,8 +12,11 @@
 
 		<DefaultItemExcludes>$(DefaultItemExcludes);**/*.binlog</DefaultItemExcludes>
 
+		<CI>false</CI>
 		<CI Condition="'$(TF_BUILD)' == 'true' or '$(APPVEYOR)' != ''">true</CI>
 		<PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)../pack</PackageOutputPath>
+		<GeneratePackageOnBuild>$(CI)</GeneratePackageOnBuild>
+		<PackageOnBuild>$(CI)</PackageOnBuild>
 	</PropertyGroup>
 
 	<ItemGroup>

src/Directory.Build.props

@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		..\azure-pipelines.yml = ..\azure-pipelines.yml
-		..\build.proj = ..\build.proj
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		GlobalAssemblyInfo.cs = GlobalAssemblyInfo.cs
@@ -16,8 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Merq.VisualStudio.proj = Merq.VisualStudio.proj
 		Merq.vssettings = Merq.vssettings
 		NuGet.Config = NuGet.Config
-		..\packages.config = ..\packages.config
 		..\README.md = ..\README.md
+		Version.targets = Version.targets
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{D01702F6-0CCA-4107-883D-57092F592644}"

src/Merq.sln

@@ -22,7 +22,7 @@
 
 	<Target Name="AppendVsixVersionToTargetVsixContainer" BeforeTargets="CreateVsixContainer" DependsOnTargets="Version">
 		<PropertyGroup>
-			<TargetVsixContainerName>$([System.IO.Path]::ChangeExtension('$(TargetVsixContainerName)', '$(VersionPrefix).vsix'))</TargetVsixContainerName>
+			<TargetVsixContainerName>$([System.IO.Path]::ChangeExtension('$(TargetVsixContainerName)', '$(FileVersion).vsix'))</TargetVsixContainerName>
 			<TargetVsixContainer Condition="'$(PackageOutputPath)' != ''">$([System.IO.Path]::Combine('$(PackageOutputPath)', '$(TargetVsixContainerName)'))</TargetVsixContainer>
 			<TargetVsixContainer Condition="'$(Out)' == ''">$([System.IO.Path]::Combine('$(OutDir)', '$(TargetVsixContainerName)'))</TargetVsixContainer>
 		</PropertyGroup>

src/Vsix/Merq.Vsix/Merq.Vsix.targets

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PackageManifest Version="2.0.0"
-                 xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
-                 xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+<PackageManifest Version="2.0.0" 
+	xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" 
+	xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
 	<Metadata>
 		<Identity Id="Merq" Version="|Merq.Vsix;GetVsixVersion|" Language="en-US" Publisher="Mobile Essentials" />
 		<DisplayName>Extensibility Message Bus</DisplayName>
@@ -20,8 +20,8 @@
 		<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,)" DisplayName="Visual Studio core editor" />
 	</Prerequisites>
 	<Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" Path="BindingRedirects.pkgdef" />
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
+		<Asset Type="Microsoft.VisualStudio.VsPackage" Path="BindingRedirects.pkgdef" />
+		<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+		<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
 	</Assets>
 </PackageManifest>