dotnet · benrr101 · Mar 31, 2026 · Mar 18, 2026 · Mar 18, 2026 · Mar 18, 2026
@@ -25,6 +25,25 @@
       -p:BuildNumber=$(BuildNumber)
     </BuildNumberArgument>
 
+    <!--
+      BuildSuffix
+      Aplies to:      BuildMds*, PackMds
+      Description:    Suffix to add at the end of the package version to indicate the generated
+                      version is a pre-release.
+                      For local developer builds, this does not need to be set. If a specific
+                      package version is needed, specify PackageVersionMds. Otherwise, the
+                      generated package version will eg, 1.2.3.dev.
+                      For automated builds, this should only be specified on pre-release builds, ie
+                      PR/CI pipeline runs. For official, production-ready builds, omit this field
+                      and include a BuildNumber.
+      Default value:  [blank]
+      Example:        prbuild
+    -->
+    <BuildSuffix Condition="'$(BuildSuffix)' == ''" />
+    <BuildSuffixArgument Condition="'$(BuildSuffix)' != ''">
+      -p:BuildSuffix=$(BuildSuffix)
+    </BuildSuffixArgument>
+
     <!--
       Configuration
       Applies to:     All targets
@@ -56,6 +75,27 @@
     -->
     <NugetPath Condition="'$(NugetPath)' == ''">nuget</NugetPath>
 
+    <!--
+      PackBuild
+      Applies to:     PackMds
+      Description:    Whether the PackMds target should run BuildMds before packing. If true,
+                      BuildMds will be called as a dependency of PackMds. If false, it will not.
+                      For most developers, building immediately before packing is the norm, and
+                      this functionality is added for convenience. However, for official builds,
+                      binaries are signed between building and packing, so building immediately
+                      before packing would clobber the signed binaries.
+      Default value:  true
+      Allowed values: (true|false)
+    -->
+    <!--
+      @TODO: This is kinda hacky, ideally we can pack via dotnet pack, which will handle building,
+        and can thus be switched off by passing -no-build. However, we're not there because we need
+        to build multiple projects before packaging, and thus need to use nuget. So, until then we
+        will switch off dependency building dynamically building the target dependencies
+    -->
+    <PackBuild Condition="'$(PackBuild)' == ''">true</PackBuild>
+    <PackMdsDependsOn Condition="'$(PackBuild.ToLower())' == 'true'">BuildMds</PackMdsDependsOn>
+
     <!--
       PackageVersionAbstractions
       Applies to:     BuildMds, BuildMdsRef, BuildMdsUnix, BuildMdsWindows
@@ -291,7 +331,8 @@
 
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
-        $(PacakgeVersionMdsArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionMdsArgument)
 
         <!-- Reference Type Arguments -->
         $(ReferenceTypeArgument)
@@ -316,7 +357,8 @@
 
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
-        $(PacakgeVersionMdsArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionMdsArgument)
 
         <!-- Reference type arguments -->
         $(ReferenceTypeArgument)
@@ -341,6 +383,7 @@
 
         <!-- Versioning arguments -->
         $(BuildNumberArgument)
+        $(BuildSuffixArgument)
         $(PackageVersionMdsArgument)
 
         <!-- Reference Type Arguments -->
@@ -367,6 +410,7 @@
 
         <!-- Versioning Arguments -->
         $(BuildNumberArgument)
+        $(BuildSuffixArgument)
         $(PackageVersionMdsArgument)
 
         <!-- Reference Type Arguments -->
@@ -388,13 +432,11 @@
     automatically build before packaging. Instead, we rely on target dependency to handle building
     the same binaries that will be packaged.
   -->
-  <Target Name="PackMds" DependsOnTargets="BuildMds">
+  <Target Name="PackMds" DependsOnTargets="$(PackMdsDependsOn)">
     <Error Text="PackageVersionAbstractions must be set!"
            Condition="'$(PackageVersionAbstractions)' == ''" />
     <Error Text="PackageVersionLogging must be set!"
            Condition="'$(PackageVersionLogging)' == ''" />
-    <Error Text="PackageVersionMds must be set !"
-           Condition="'$(PackageVersionMds)' == ''" />
 
     <PropertyGroup>
       <GitCommand>
@@ -408,13 +450,37 @@
       <Output TaskParameter="ConsoleOutput" PropertyName="CommitId" />
     </Exec>
 
+    <!-- This is a bit hacky, and can be (@TODO:) removed once packaging is done w/o a nuspec from dotnet -->
+    <PropertyGroup>
+      <GetMdsPackageVersionCommand>
+        "$(DotnetPath)dotnet" msbuild "$(MdsProjectPath)"
+        -nologo
+        -verbosity:quiet
+        -getProperty:MdsPackageVersion
+
+        <!-- Versioning arguments -->
+        $(BuildNumberArgument)
+        $(BuildSuffixArgument)
+        $(PackageVersionMdsArgument)
+      </GetMdsPackageVersionCommand>
+      <!-- Convert more than one whitespace character into one space -->
+      <GetMdsPackageVersionCommand>$([System.Text.RegularExpressions.Regex]::Replace($(GetMdsPackageVersionCommand), "\s+", " "))</GetMdsPackageVersionCommand>
+    </PropertyGroup>
+    <Message Text=">>> Evaluating MDS package version via command: $(GetMdsPackageVersionCommand)" />
+    <Exec ConsoleToMsBuild="true" Command="$(GetMdsPackageVersionCommand)">
+      <Output TaskParameter="ConsoleOutput" PropertyName="_EvaluatedMdsPackageVersion" />
+    </Exec>
+    <Error Text="Failed to evaluate MdsPackageVersion for PackMds."
+           Condition="'$(_EvaluatedMdsPackageVersion)' == ''" />
+
     <PropertyGroup>
+      <_EvaluatedMdsPackageVersion>$([System.Text.RegularExpressions.Regex]::Replace($(_EvaluatedMdsPackageVersion), "\s", ""))</_EvaluatedMdsPackageVersion>
       <CommitId>$([System.Text.RegularExpressions.Regex]::Replace($(CommitId), "\s", ""))</CommitId>
       <NuGetCommand>
         "$(NugetPath)" pack "$(MdsNuspecPath)"
         -Symbols
         -SymbolPackageFormat snupkg
-        -Version "$(PackageVersionMds)"
+        -Version "$(_EvaluatedMdsPackageVersion)"
         -OutputDirectory "$(MdsArtifactRoot)/$(ReferenceType)-$(Configuration)"
         -properties "COMMITID=$(CommitId);Configuration=$(Configuration);ReferenceType=$(ReferenceType);AbstractionsPackageVersion=$(PackageVersionAbstractions);LoggingPackageVersion=$(PackageVersionLogging)"
       </NuGetCommand>
@@ -487,7 +553,7 @@
      <DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
    </PropertyGroup>
    <Message Text=">>> Running manual tests for MDS via command: $(DotnetCommand)" />
    <Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
  </Target>

  <!-- TestMdsUnit: Runs unit tests for MDS -->

@@ -60,7 +60,9 @@ parameters:
     type: string
     default: $(loggingPackageVersion)
 
-  # Necessary to build AKV Provider when referenceType is Package.  Ignored when referenceType is Project.
+  # Package version to use for MDS package. Because we explicitly provide this version, the
+  # assembly version will be generated based on this package version and the build number.
+  # See MdsVersions.props for details on how this works.
   - name: mdsPackageVersion
     type: string
     default: $(mdsPackageVersion)
@@ -84,7 +86,7 @@ steps:
         msbuildArguments:
           -t:BuildMds
           -p:ReferenceType=${{ parameters.referenceType }}
-          -p:BuildNumber=${{ parameters.buildNumber }}
+          -p:BuildNumber=${{ parameters.assemblyBuildNumber }}
           -p:PackageVersionAbstractions=${{ parameters.abstractionsPackageVersion }}
           -p:PackageVersionLogging=${{ parameters.loggingPackageVersion }}
           -p:PackageVersionMds=${{ parameters.mdsPackageVersion }}

@@ -54,13 +54,13 @@ variables:
   - name: loggingPackageVersion
     value: 1.0.0.$(Build.BuildNumber)-ci
 
-  # MDS library assembly file version
-  - name: mdsAssemblyFileVersion
-    value: 7.0.0.$(assemblyBuildNumber)
-
   # MDS library NuGet package version
+  # NOTE: This differs from the other structures! MdsVersions.props will deconstruct a provided
+  #    package version and build an assembly version from it. If the build number is included
+  #    before the "-" the build number will be appended again, generating an invalid file version.
+  # @TODO: This is a band-aid to ensure that CI builds until we can centralize versioning.
   - name: mdsPackageVersion
-    value: 7.0.0.$(Build.BuildNumber)-ci
+    value: 7.0.0-ci$(AssemblyBuildNumber)
 
   # Local NuGet feed directory where downloaded pipeline artifacts are placed.
   # NuGet.config references this as a local package source for restore.

@@ -134,7 +134,7 @@ jobs:
       - template: /eng/pipelines/steps/install-dotnet.yml@self
 
       # Perform Roslyn analysis before building, since this step will clobber build output.
-      - template: /eng/pipelines/onebranch/steps/code-analyze-step.yml@self
+      - template: /eng/pipelines/onebranch/steps/roslyn-analyzers-csproj-step.yml@self
         parameters:
           msBuildArguments: >-
             -t:$(buildTarget)
@@ -143,15 +143,15 @@ jobs:
             ${{ parameters.versionProperties }}
 
       # Build the package, producing DLLs only (no NuGet package yet).
-      - template: /eng/pipelines/onebranch/steps/compound-build-csproj-step.yml@self
+      - template: /eng/pipelines/onebranch/steps/build-csproj-step.yml@self
         parameters:
           buildTarget: $(buildTarget)
           buildConfiguration: ${{ parameters.buildConfiguration }}
           versionProperties: ${{ parameters.versionProperties }}
 
       - ${{ if eq(parameters.isOfficial, true) }}:
           # ESRP sign the DLLs.
-          - template: /eng/pipelines/onebranch/steps/compound-esrp-dll-signing-step.yml@self
+          - template: /eng/pipelines/onebranch/steps/esrp-dll-signing-step.yml@self
             parameters:
               appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
               appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
@@ -182,27 +182,38 @@ jobs:
           flattenFolders: false
 
       # Pack the signed DLLs into NuGet package (NoBuild=true).
-      - template: /eng/pipelines/onebranch/steps/compound-pack-csproj-step.yml@self
+      - template: /eng/pipelines/onebranch/steps/pack-csproj-step.yml@self
         parameters:
           packTarget: $(packTarget)
           buildConfiguration: ${{ parameters.buildConfiguration }}
           versionProperties: ${{ parameters.versionProperties }}
 
       - ${{ if eq(parameters.isOfficial, true) }}:
           # ESRP sign the NuGet package.
-          - template: /eng/pipelines/onebranch/steps/compound-esrp-nuget-signing-step.yml@self
+          - template: /eng/pipelines/onebranch/steps/esrp-nuget-signing-step.yml@self
             parameters:
               appRegistrationClientId: ${{ parameters.appRegistrationClientId }}
               appRegistrationTenantId: ${{ parameters.appRegistrationTenantId }}
               authAkvName: ${{ parameters.authAkvName }}
               authSignCertName: ${{ parameters.authSignCertName }}
               esrpClientId: ${{ parameters.esrpClientId }}
               esrpConnectedServiceName: ${{ parameters.esrpConnectedServiceName }}
-              pattern: ${{ parameters.packageFullName }}.*nupkg
+              searchPath: $(PACK_OUTPUT)
+              searchPattern: '${{ parameters.packageFullName }}.*nupkg'
 
       # Publish symbols to servers
+      # @TODO: Get these parameters from variables/libraries
       - ${{ if eq(parameters.publishSymbols, true) }}:
           - template: /eng/pipelines/onebranch/steps/publish-symbols-step.yml@self
             parameters:
-              packageFullName: ${{ parameters.packageFullName }}
-              packageVersion: ${{ parameters.packageVersion }}
+              artifactName: '${{ parameters.packageFullName }}_symbols_$(System.TeamProject)_$(Build.Repository.Name)_$(Build.SourceBranchName)_${{ parameters.packageVersion }}_$(System.TimelineId)'
+              azureSubscription: 'Symbols publishing Workload Identity federation service-ADO.Net'
+              packageName: '${{ parameters.packageFullName }}'
+              publishProjectName: 'Microsoft.Data.SqlClient.SNI' # This is used for all SqlClient packages. Don't know why, but it is.
+              publishServer: '$(SymbolServer)'
+              publishToInternal: 'true'
+              publishToPublic: 'true'
+              publishTokenUri: '$(SymbolTokenUri)'
+              searchPattern: '**/${{ parameters.packageFullName }}*.pdb'
+              uploadAccount: 'SqlClientDrivers'
+              version: '${{ parameters.packageVersion }}'