Version upgrade for next releases (#3271)

* Version upgrade for next releases
* Make adjustments

eng/pipelines/dotnet-sqlclient-ci-core.yml

@@ -71,7 +71,7 @@ parameters:
 
 variables:
   - template: libraries/ci-build-variables.yml@self
-
+  
   - name: artifactName
     value: Artifacts
 

eng/pipelines/libraries/common-variables.yml

@@ -25,3 +25,26 @@ variables:
     value: $(REPOROOT)/symbols
   - name: artifactDirectory
     value: '$(REPOROOT)/packages'
+
+  # Update this after every release. This is used to generate the MDS NuGet package version.
+  - name: Major
+    value: '6'
+  - name: Minor
+    value: '1'
+  - name: Patch
+    value: '0'
+
+    # Update this for preview releases.
+  - name: Preview
+    value: '-preview'
+  - name: Revision
+    value: '1'
+
+  - name: NugetPackageVersion
+    value: $(Major).$(Minor).$(Patch)
+  - name: PreviewNugetPackageVersion
+    value: $(Major).$(Minor).$(Patch)$(Preview)$(Revision).$(Build.BuildNumber)
+  - name: AssemblyFileVersion
+    value: '$(Major).$(Minor)$(Patch).$(Build.BuildNumber)'
+  - name: nuspecPath
+    value: '$(REPOROOT)/tools/specs/Microsoft.Data.SqlClient.nuspec'

eng/pipelines/libraries/mds-variables.yml

@@ -6,12 +6,3 @@
 
 variables:
   - group: Release Variables
-
-  - name: NugetPackageVersion
-    value: $(Major).$(Minor).$(Patch)
-  - name: PreviewNugetPackageVersion
-    value: $(Major).$(Minor).$(Patch)$(Preview)$(Revision).$(Build.BuildNumber)
-  - name: AssemblyFileVersion
-    value: '$(Major).$(Minor)$(Patch).$(Build.BuildNumber)'
-  - name: nuspecPath
-    value: '$(REPOROOT)/tools/specs/Microsoft.Data.SqlClient.nuspec'

tools/props/Versions.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MdsVersionDefault>6.0.0</MdsVersionDefault>
+    <MdsVersionDefault>6.1.0</MdsVersionDefault>
     <BuildNumber Condition="'$(BuildNumber)' == ''">0</BuildNumber>
     <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">$(MdsVersionDefault).$(BuildNumber)</AssemblyFileVersion>
     <FileVersion>$(AssemblyFileVersion)</FileVersion>