Task 41737: Merge feat/azure-split to main: Step 3 - Tie everything together

- Now using reference type to choose NuGet config file.

Author: paulmedynski

NuGet.config

@@ -14,12 +14,5 @@
     -->
     <add key="governed" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
 
-    <!--
-      This package source is used by developers and our pipelines builds when we need to reference
-      packages that are not available on the public nuget.org feed, for example to test MDS that
-      depends on a version of Abstractions that was just built in the workspace.
-    -->
-    <add key="local" value="packages/" />
-
   </packageSources>
 </configuration>

NuGet.config.local

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+
+    <!-- Clear all inherited feeds. -->
+    <clear />
+
+    <!--
+      We do not use the public nuget.org feed.  Instead, we use a governed feed maintained by our
+      SqlClientDrivers ADO organization.  Packages must be individually vetted and added to this
+      feed manually before they will be available for consumption by our builds.
+
+      https://sqlclientdrivers.visualstudio.com/public/_artifacts/feed/sqlclient
+    -->
+    <add key="governed" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
+
+    <!--
+      This package source is used by developers and our pipelines builds when we need to reference
+      packages that are not available on the public nuget.org feed, for example to test MDS that
+      depends on a version of Abstractions that was just built in the workspace.
+    -->
+    <add key="local" value="packages/" />
+
+  </packageSources>
+</configuration>

build.proj

@@ -10,7 +10,10 @@
     <!-- SourceLink variable-->
     <DisableSourceLink>false</DisableSourceLink>
 
-    <RestoreConfigFile>src\NuGet.config</RestoreConfigFile>
+    <!-- Use the NuGet.config with a local source for Package reference builds. -->
+    <NuGetConfigFile>$(RepoRoot)/NuGet.config</NuGetConfigFile>
+    <NuGetConfigFile Condition="'$(ReferenceType)' == 'Package'">$(NuGetConfigFile).local</NuGetConfigFile>
+
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
     <!-- Flag to control whether or not to build Microsoft.DotNet.GenAPI project in tools -->
@@ -29,7 +32,7 @@
     <TargetNetFxVersion Condition="$(TargetGroup) == 'netfx' AND $(TargetNetFxVersion) == ''">$(TF)</TargetNetFxVersion>
     <GenerateNuget Condition="'$(GenerateNuget)' == '' AND '$(IsEnabledWindows)' == 'true'">true</GenerateNuget>
 
-    <CommonProperties>Configuration=$(Configuration);ReferenceType=$(ReferenceType)</CommonProperties>
+    <CommonProperties>Configuration=$(Configuration);ReferenceType=$(ReferenceType);RestoreConfigFile=$(NuGetConfigFile)</CommonProperties>
     <SqlServerLibProperties>$(CommonProperties);AssemblyVersion=$(SqlServerAssemblyVersion);AssemblyFileVersion=$(SqlServerAssemblyFileVersion);Version=$(SqlServerPackageVersion);</SqlServerLibProperties>
     <ProjectProperties>$(CommonProperties);AssemblyFileVersion=$(AssemblyFileVersion);TargetsWindows=$(TargetsWindows);TargetsUnix=$(TargetsUnix);</ProjectProperties>
     <TestProjectProperties>$(ProjectProperties);BuildForRelease=false;TargetNetCoreVersion=$(TargetNetCoreVersion);TargetNetFxVersion=$(TargetNetFxVersion)</TestProjectProperties>
@@ -462,7 +465,7 @@
     <!-- @TODO: TestTargetOS makes this far more complicated than it needs to be. We should remove it. -->
     <!-- @TODO: RemoveProperties shouldn't be necessary -->
     <Message Text=">>> Restoring AKV project" />
-    <MSBuild Projects="@(AKVProvider)" Targets="Restore" />
+    <MSBuild Projects="@(AKVProvider)" Targets="Restore" Properties="$(CommonProperties)" />
 
     <PropertyGroup>
       <BuildAkvProperties>$(CI);TestTargetOS=$(TestOS)netfx;Platform=AnyCPU;$(ProjectProperties);$(NugetPackProperties)</BuildAkvProperties>
@@ -510,7 +513,7 @@
   </Target>
 
   <Target Name="BuildAKVNetCoreAllOS" DependsOnTargets="BuildNetCore">
-    <MSBuild Projects="@(AKVProvider)" Targets="restore" Properties="TestTargetOS=$(TestOS)netcoreapp" />
+    <MSBuild Projects="@(AKVProvider)" Targets="restore" Properties="$(CommonProperties);TestTargetOS=$(TestOS)netcoreapp" />
     <MSBuild Projects="@(AKVProvider)" Properties="$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;OSGroup=Unix;" RemoveProperties="TargetsWindows;TargetsUnix;" />
     <MSBuild Projects="@(AKVProvider)" Properties="$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;OSGroup=Windows_NT;" RemoveProperties="TargetsWindows;TargetsUnix;" Condition="'$(IsEnabledWindows)' == 'true'" />
     <MSBuild Projects="@(AKVProvider)" Properties="$(CI);TestTargetOS=$(TestOS)netcoreapp;$(ProjectProperties);Platform=AnyCPU;OSGroup=AnyOS;" RemoveProperties="TargetsWindows;TargetsUnix;" />

eng/pipelines/common/templates/steps/run-all-tests-step.yml

@@ -75,10 +75,12 @@ steps:
           msbuildArguments: >-
             -t:RunUnitTests
             -p:TF=${{ parameters.targetFramework }}
+            -p:ReferenceType=${{ parameters.referenceType }}
         ${{ else }}: # x86
           msbuildArguments: >-
             -t:RunUnitTests
             -p:TF=${{ parameters.targetFramework }}
+            -p:ReferenceType=${{ parameters.referenceType }}
             -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
 
     - task: MSBuild@1
@@ -93,12 +95,14 @@ steps:
           msbuildArguments: >-
             -t:RunUnitTests
             -p:TF=${{ parameters.targetFramework }}
+            -p:ReferenceType=${{ parameters.referenceType }}
             -p:Filter="category=flaky"
             -p:CollectCodeCoverage=false
         ${{ else }}: # x86
           msbuildArguments: >-
             -t:RunUnitTests
             -p:TF=${{ parameters.targetFramework }}
+            -p:ReferenceType=${{ parameters.referenceType }}
             -p:DotnetPath=${{ parameters.dotnetx86RootPath }}
             -p:Filter="category=flaky"
             -p:CollectCodeCoverage=false

eng/pipelines/jobs/pack-azure-package-ci-job.yml

@@ -95,10 +95,18 @@ jobs:
       - name: dotnetPackagesDir
         value: $(Build.StagingDirectory)/dotnetPackages
 
+      # The NuGet.config file to use for restoring packages.
+      - name: nugetConfigFile
+        ${{ if eq(parameters.referenceType, 'Package') }}:
+          value: $(Build.SourcesDirectory)/NuGet.config.local
+        ${{ else }}:
+          value: $(Build.SourcesDirectory)/NuGet.config
+
       # dotnet CLI arguments common to all commands.
       - name: commonArguments
         value: >-
           --verbosity ${{ parameters.dotnetVerbosity }}
+          --configfile $(nugetConfigFile)
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
 

eng/pipelines/jobs/test-azure-package-ci-job.yml

@@ -136,10 +136,18 @@ jobs:
       - name: project
         value: src/Microsoft.Data.SqlClient.Extensions/Azure/test/Azure.Test.csproj
 
+      # The NuGet.config file to use for restoring packages.
+      - name: nugetConfigFile
+        ${{ if eq(parameters.referenceType, 'Package') }}:
+          value: $(Build.SourcesDirectory)/NuGet.config.local
+        ${{ else }}:
+          value: $(Build.SourcesDirectory)/NuGet.config
+
       # dotnet CLI arguments common to all commands.
       - name: commonArguments
         value: >-
           --verbosity ${{ parameters.dotnetVerbosity }}
+          --configfile $(nugetConfigFile)
           -p:ReferenceType=${{ parameters.referenceType }}
           -p:AbstractionsPackageVersion=${{ parameters.abstractionsPackageVersion }}
           -p:MdsPackageVersion=${{ parameters.mdsPackageVersion }}

eng/pipelines/stages/stress-tests-ci-stage.yml

@@ -95,6 +95,7 @@ stages:
         value: >-
           --verbosity ${{parameters.dotnetVerbosity}}
           --artifacts-path $(dotnetArtifactsDir)
+          --configfile=$(Build.SourcesDirectory)/NuGet.config.local
           -p:MdsPackageVersion=${{parameters.mdsPackageVersion}}
           -p:AzurePackageVersion=${{parameters.azurePackageVersion}}