xamarin · mjbond-msft · Feb 12, 2022 · Feb 12, 2022 · Feb 12, 2022 · Feb 12, 2022
diff --git a/NuGet.Config b/NuGet.Config
@@ -2,8 +2,7 @@
 <configuration>
     <packageSources>
         <clear />
-        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-        <add key="nugetizer" value="https://ci.appveyor.com/nuget/nugetizer3000" />
+        <add key="xvs" value="https://devdiv.pkgs.visualstudio.com/_packaging/xamarin-xvs/nuget/v3/index.json" />
     </packageSources>
     <disabledPackageSources>
         <clear />

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Extensions to the Visual Studio SDK to make extensions authoring easier.
 
 
 [![TFS Build status](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6415/badge)](https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=6415&_a=completed)
-[![License](https://img.shields.io/github/license/xamarin/Xamarin.VSSDK.svg)](https://github.com/xamarin/Xamarin.VSSDK/blob/master/LICENSE)
+[![License](https://img.shields.io/github/license/xamarin/Xamarin.VSSDK.svg)](https://github.com/xamarin/Xamarin.VSSDK/blob/main/LICENSE)
 
 ## Installation
 
@@ -43,7 +43,7 @@ which provides all the necessary APIs to author VS extensions.
 When using VS2017 Update 3 or greater (15.3+), you can also select the target Visual Studio version by 
 selecting the relevant Target Framework from the Run dropdown:
 
-![Active Debug Framework Selection](https://raw.github.com/xamarin/Xamarin.VSSDK/master/test/ActiveDebugFramework.png)
+![Active Debug Framework Selection](https://raw.github.com/xamarin/Xamarin.VSSDK/main/test/ActiveDebugFramework.png)
 
 When doing so, the `TargetFramework` will be set to the selected one, causing the right VSSDK BuildTools 
 package to be used to deploy the extension to the right Experimental Instance. So you can use VS2017 to 

diff --git a/build.yml b/build.yml
@@ -1,84 +1,147 @@
-pool:
-  vmImage: windows-2019
+# https://docs.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=azure-devops
+trigger:
+  batch: false
+  branches:
+    include:
+    - main
+
+# https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/github?view=azure-devops&tabs=yaml#pr-triggers
+pr:
+  autoCancel: false
+  branches:
+    include:
+    - main
 
 variables:
-- group: Xamarin NuGetized
+  - group: Xamarin NuGetized
 
 resources:
   repositories:
   - repository: templates
     type: github
     name: xamarin/yaml-templates
-    ref: refs/heads/master
+    ref: refs/heads/main
     endpoint: xamarin
 
-steps:
-
-- checkout: self
-  clean: true
-
-- task: UseDotNet@2
-  inputs:
-    version: 2.1.807
-
-- task: UseDotNet@2
-  inputs:
-    useGlobalJson: true
-
-- task: MSBuild@1
-  displayName: Restore
-  inputs:
-    solution: build.proj
-    msbuildArguments: /t:Restore /bl:"$(Build.ArtifactStagingDirectory)\restore.binlog"
-
-- task: MSBuild@1
-  displayName: Build
-  inputs:
-    solution: build.proj
-    msbuildArguments: /t:Build /p:Out="$(Build.ArtifactStagingDirectory)" /bl:"$(Build.ArtifactStagingDirectory)\build.binlog"
-
-- task: VSTest@2
-  displayName: Test
-  inputs:
-    testAssemblyVer2: |-
-      **\*.Tests.dll
-      !**\xunit*.dll
-    codeCoverageEnabled: 'true'
-    publishRunAttachments: 'true'
-
-- template: sleet/v1.yml@templates
-  parameters:
-    connectionString: $(SLEET_FEED_CONNECTIONSTRING)
-    container: xvs
-    packages: $(Build.ArtifactStagingDirectory)
-
-- task: PublishBuildArtifacts@1
-  displayName: Publish
-  condition: always()
-  inputs:
-    PathtoPublish: $(Build.ArtifactStagingDirectory)
-    ArtifactName: output
-    ArtifactType: Container
-
-- task: NuGetCommand@2
-  displayName: 'NuGet Update'
-  inputs:
-    command: custom
-    arguments: 'update -self'
-
-- pwsh: |
-    $branch = '$(Build.SourceBranch)'
-    $push = "$($branch -eq 'refs/heads/master' -or $branch -match 'refs/heads/d\d\d-*|refs/heads/rel/*')".ToLowerInvariant()
-    Write-Host "##vso[task.setvariable variable=PushPackages;]$push"
-  displayName: Set PushPackages
-  condition: eq(variables['PushPackages'], '')
-
-- task: NuGetCommand@2
-  displayName: Push Packages
-  continueOnError: true
-  condition: and(succeeded(), eq(variables['PushPackages'], 'true'))
-  inputs:
-    command: push
-    packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
-    nuGetFeedType: external
-    publishFeedCredentials: 'xamarin-impl public feed'
+jobs:
+- job: Build
+  pool:
+    name: AzurePipelines-EO
+    demands:
+    - ImageOverride -equals AzurePipelinesWindows2019compliant
+
+  steps:
+  - checkout: self
+    clean: true
+
+  - task: UseDotNet@2
+    inputs:
+      version: 2.1.818
+
+  - task: UseDotNet@2
+    inputs:
+      useGlobalJson: true
+
+  - task: NuGetAuthenticate@0
+    displayName: Authenticate NuGet feeds
+    inputs:
+      forceReinstallCredentialProvider: true
+
+  - task: MSBuild@1
+    displayName: Restore
+    inputs:
+      solution: src\Xamarin.VSSDK.sln
+      msbuildArguments: /t:Restore /p:Configuration=Release /bl:"$(Build.ArtifactStagingDirectory)\restore.binlog"
+
+  - task: MSBuild@1
+    displayName: Build
+    inputs:
+      solution: src\Xamarin.VSSDK.sln
+      msbuildArguments: /t:Build /p:Configuration=Release /bl:"$(Build.ArtifactStagingDirectory)\build.binlog" /maxCpuCount:1 /v:detailed   # UNDONE: Help serialize build log: /m:1
+
+  # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/test/vstest?view=azure-devops
+  - task: VSTest@2
+    displayName: Test
+    inputs:
+      testAssemblyVer2: |-
+        **\*.Tests.dll
+        !**\xunit*.dll
+      codeCoverageEnabled: 'true'
+      publishRunAttachments: 'true'
+      configuration: Release
+      searchFolder: "$(Build.SourcesDirectory)/test"
+
+  - powershell: |
+      $sourcesDirectory = "$(Build.SourcesDirectory)"
+      Write-Host "Sources directory: ${sourcesDirectory}"
+
+      $artifactsDirectory = "$(Build.ArtifactStagingDirectory)"
+      Write-Host "Artifacts directory: ${artifactsDirectory}"
+
+      [IO.File]::Copy("${sourcesDirectory}/NuGet.Config", "${artifactsDirectory}/NuGet.Config")
+
+      $outDirectory = "${sourcesDirectory}/out"
+      Write-Host "Build output directory: ${outDirectory}"
+
+      if ([IO.Directory]::Exists($outDirectory)) {
+        $files = [IO.Directory]::GetFiles($outDirectory, '*.nupkg')
+
+        if ($null -ne $files -and $files.Count -gt 0) {
+          $files | foreach {
+            $filename = [IO.Path]::GetFileName($_)
+            $destPathAndFilename = [IO.Path]::Combine($artifactsDirectory, $filename)
+            Write-Host "Copy $_ to ${destPathAndFilename}"
+            [IO.File]::Copy($_, $destPathAndFilename)
+          }
+        } else {
+          Write-Host "ERROR: Nuget files not found: ${outDirectory}"
+        }
+      } else {
+        Write-Host "Output directory not found: ${outDirectory}"
+        Write-Host "NuGet packages in artifacts directory: ${artifactsDirectory}"
+        $files = [IO.Directory]::GetFiles($artifactsDirectory, '*.nupkg')
+        if ($null -ne $files -and $files.Count -gt 0) {
+          $files | foreach { Write-Host " $([IO.Path]::GetFileName($_))" }
+        } else {
+          Write-Host "No NuGet files found: ${artifactsDirectory}"
+        }
+      }
+    displayName: 'Stage artifacts'
+
+  - template: sleet/v1.yml@templates
+    parameters:
+      connectionString: $(SLEET_FEED_CONNECTIONSTRING)
+      container: xvs
+      packages: $(Build.ArtifactStagingDirectory)
+
+  - task: PublishBuildArtifacts@1
+    displayName: Publish
+    condition: always()
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)
+      ArtifactName: output
+      ArtifactType: Container
+
+  - pwsh: |
+      $branch = '$(Build.SourceBranch)'
+      $push = "$($branch -eq 'refs/heads/main' -or $branch -match 'refs/heads/d\d\d-*|refs/heads/rel/*')".ToLowerInvariant()
+      Write-Host "##vso[task.setvariable variable=PushPackages;]$push"
+    displayName: Set PushPackages
+    condition: eq(variables['PushPackages'], '')
+
+  - task: NuGetCommand@2
+    displayName: 'NuGet Update'
+    condition: and(succeeded(), eq(variables['PushPackages'], 'true'))
+    inputs:
+      command: custom
+      arguments: 'update -self'
+
+  - task: NuGetCommand@2
+    displayName: Push Packages
+    continueOnError: true
+    condition: and(succeeded(), eq(variables['PushPackages'], 'true'))
+    inputs:
+      command: push
+      packagesToPush: '$(Build.ArtifactStagingDirectory)/*.nupkg'
+      nuGetFeedType: external
+      publishFeedCredentials: 'xamarin-impl public feed'
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.301",
+    "version": "3.1.417",
     "rollForward": "feature"
   }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -8,7 +8,7 @@
     <Company>Microsoft</Company>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageLicenseUrl>https://github.com/xamarin/Xamarin.VSSDK/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl>https://github.com/xamarin/Xamarin.VSSDK/blob/main/LICENSE</PackageLicenseUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackageProjectUrl>https://github.com/xamarin/Xamarin.VSSDK</PackageProjectUrl>
 
@@ -23,7 +23,8 @@
     <PackOnBuild>true</PackOnBuild>
     <PrimaryOutputKind>build</PrimaryOutputKind>
     <InferLegacyPackageReferences>false</InferLegacyPackageReferences>
-    <PackageOutputPath>$(MSBuildThisFileDirectory)..\out</PackageOutputPath>
+    <PackageOutputPath Condition="'$(Out)' == ''">$(MSBuildThisFileDirectory)..\out</PackageOutputPath>
+    <PackageOutputPath Condition="'$(Out)' != ''">$(Out)</PackageOutputPath>
 
     <!-- Build -->
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

diff --git a/src/VSSDK.BuildTools/Xamarin.VSSDK.BuildTools.csproj b/src/VSSDK.BuildTools/Xamarin.VSSDK.BuildTools.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net46</TargetFramework>
+		<TargetFramework>net472</TargetFramework>
 		<RootNamespace>Xamarin.VSSDK</RootNamespace>
 
 		<PackageId>Xamarin.VSSDK.BuildTools</PackageId>
@@ -32,12 +32,13 @@
   </ItemGroup>
 
   <ItemGroup Label="Visual Studio 2019">
-		<!-- TODO: updating to 16.x build tools requires changes to DeployVsixExtensionFiles.targets. Enabling/Installing has changed  -->
-    <PackageFile Include="Microsoft.VSSDK.BuildTools" Version="15.9.3039" Kind="Dependency" TargetFramework="net472" />
+    <!-- TODO: updating to 16.x build tools requires changes to DeployVsixExtensionFiles.targets. Enabling/Installing has changed. Also see TODO comment in vssdk-installer.proj  -->
+	<!-- https://www.nuget.org/packages/Microsoft.VSSDK.BuildTools -->
+    <PackageFile Include="Microsoft.VSSDK.BuildTools" Version="16.10.1055" Kind="Dependency" TargetFramework="net472" />
   </ItemGroup>
 
   <ItemGroup>
-		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.11.0" PrivateAssets="all" />
 		<PackageReference Include="netfx-System.StringResources" Version="3.1.5" PrivateAssets="all" />
 		<PackageReference Include="NuGet.Build.Packaging" Version="0.1.323" PrivateAssets="all" />
 	</ItemGroup>
@@ -63,4 +64,8 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <PackageReference Update="GitInfo" Version="2.2.0" />
+	</ItemGroup>
+
 </Project>
diff --git a/src/VSSDK/Xamarin.VSSDK.Defaults.targets b/src/VSSDK/Xamarin.VSSDK.Defaults.targets
@@ -9,14 +9,14 @@
 	<PropertyGroup>
 		<!-- Default $(Dev) according to either '.' value or $(ActiveDebugFramework). These are explicit user-chosen values -->
 		<Dev Condition="'$(Dev)' == '.'">$(VisualStudioVersion)</Dev>
-    <Dev Condition="'$(Dev)' == '' And '$(ActiveDebugFramework)' == 'net472'">16.0</Dev>
-    <Dev Condition="'$(Dev)' == '' And '$(ActiveDebugFramework)' == 'net46'">15.0</Dev>
+		<Dev Condition="'$(Dev)' == '' And '$(ActiveDebugFramework)' == 'net472'">16.0</Dev>
+		<Dev Condition="'$(Dev)' == '' And '$(ActiveDebugFramework)' == 'net46'">15.0</Dev>
 		<Dev Condition="'$(Dev)' == '' And '$(ActiveDebugFramework)' == 'net452'">14.0</Dev>
 		<Dev Condition="'$(Dev)' == '' And '$(ActiveDebugFramework)' == 'net45'">12.0</Dev>
 
 		<!-- If no ActiveDebugFramework was set, just set it to the one we determined, for consistency -->
-    <ActiveDebugFramework Condition="'$(Dev)' == '16.0'">net472</ActiveDebugFramework>
-    <ActiveDebugFramework Condition="'$(Dev)' == '15.0'">net46</ActiveDebugFramework>
+		<ActiveDebugFramework Condition="'$(Dev)' == '16.0'">net472</ActiveDebugFramework>
+		<ActiveDebugFramework Condition="'$(Dev)' == '15.0'">net46</ActiveDebugFramework>
 		<ActiveDebugFramework Condition="'$(Dev)' == '14.0'">net452</ActiveDebugFramework>
 		<ActiveDebugFramework Condition="'$(Dev)' == '12.0'">net45</ActiveDebugFramework>
 

diff --git a/src/VSSDK/Xamarin.VSSDK.csproj b/src/VSSDK/Xamarin.VSSDK.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net46</TargetFramework>
+		<TargetFramework>net472</TargetFramework>
 		<RootNamespace>Xamarin.VSSDK</RootNamespace>
 
 		<PackageId>Xamarin.VSSDK</PackageId>
@@ -58,11 +58,15 @@
 	</ItemGroup>
 
   <ItemGroup Label="Visual Studio 2019">
-		<PackageFile Include="Microsoft.VisualStudio.SDK" Version="16.0.204" TargetFramework="net472" Kind="Dependency" ExcludeAssets="runtime" />
+		<PackageFile Include="Microsoft.VisualStudio.SDK" Version="16.10.31321.278" TargetFramework="net472" Kind="Dependency" ExcludeAssets="runtime" />
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="NuGet.Build.Packaging" Version="0.1.323" PrivateAssets="all" />
+	  <PackageReference Include="NuGet.Build.Packaging" Version="0.2.2" PrivateAssets="all" />
 	</ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="GitInfo" Version="2.2.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Version.targets b/src/Version.targets
@@ -17,9 +17,9 @@ AssemblyVersion=$(AssemblyVersion)" />
 
   <Target Name="_ClearTagVersion" AfterTargets="_GitBaseVersionTag" BeforeTargets="_GitBaseVersionFile">
     <PropertyGroup Condition="'$(GitBaseVersion)' != '' and '$(GitSemVerSource)' == 'Tag' and '$(GitCommits)' != '0'">
-      <!-- If the current commit isn't exactly the tagged commit, remove the determined base version, 
+      <!-- If the current commit isn't exactly the tagged commit, remove the determined base version,
            so that probing continues as usual (GitInfo file follows).
-           This means that we can push a version from master/dev without having to create a branch.
+           This means that we can push a version from main/dev without having to create a branch.
            Typical "true" releases will likely come from versioned branches though.
       -->
       <GitBaseVersion></GitBaseVersion>
@@ -46,17 +46,17 @@ AssemblyVersion=$(AssemblyVersion)" />
       <GitBranch Condition="'$(SYSTEM_PULLREQUEST_TARGETBRANCH)' == '' and '$(BUILD_SOURCEBRANCHNAME)' != ''">$(BUILD_SOURCEBRANCHNAME)</GitBranch>
       <GitBranch Condition="'$(APPVEYOR_REPO_BRANCH)' != ''">$(APPVEYOR_REPO_BRANCH)</GitBranch>
 
-      <!-- NOTE: build metadata does not affect version matching, so even if you work from a different branch+commit that gets 
-           rebased+merged later on, the version # might still be the same (provided there weren't additional commits in master 
+      <!-- NOTE: build metadata does not affect version matching, so even if you work from a different branch+commit that gets
+           rebased+merged later on, the version # might still be the same (provided there weren't additional commits in main
            before the rebase+merge.
       -->
       <_IndexOfBranchSlash>$(GitBranch.LastIndexOf('/'))</_IndexOfBranchSlash>
       <_IndexOfBranchSubstring>$([MSBuild]::Add('$(_IndexOfBranchSlash)', '1'))</_IndexOfBranchSubstring>
       <_GitBranch Condition="'$(_IndexOfBranchSlash)' != '0'">$(GitBranch.Substring($(_IndexOfBranchSubstring)))</_GitBranch>
       <_GitBranch Condition="'$(_IndexOfBranchSlash)' == '0'">$(GitBranch)</_GitBranch>
 
-      <!-- We'll use GitFlow and ship publicly from master, meaning we don't need branch metadata from there -->
-      <SemVerMetadata Condition="'$(_GitBranch)' != 'master'">$(_GitBranch).</SemVerMetadata>
+      <!-- We'll use GitFlow and ship publicly from main, meaning we don't need branch metadata from there -->
+      <SemVerMetadata Condition="'$(_GitBranch)' != 'main'">$(_GitBranch).</SemVerMetadata>
       <SemVerMetadata>$(SemVerMetadata)sha.$(GitCommit)</SemVerMetadata>
 
       <!-- If there is a pre-release label, fix the major.minor.build and increment the release label digit instead. -->