Skip to content

Commit 371cfe3

Browse files
committed
Merge branch 'fixsql2' of https://github.com/markcowl/azure-powershell-pr into crp2
Conflicts: src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj src/ResourceManager/Sql/Commands.Sql.Test/packages.config src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj src/ResourceManager/Sql/Commands.Sql/packages.config tools/LocalFeed/Microsoft.Azure.Management.Sql.0.21.1-prerelease.nupkg
2 parents 93c086c + b2524f3 commit 371cfe3

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Microsoft.Azure.Management.Sql">
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.21.1-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.22.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>

src/ResourceManager/Sql/Commands.Sql.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="0.18.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
10-
<package id="Microsoft.Azure.Management.Sql" version="0.21.1-prerelease" targetFramework="net45" />
10+
<package id="Microsoft.Azure.Management.Sql" version="0.22.0-prerelease" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5571.32271-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
175175
</Reference>
176176
<Reference Include="Microsoft.Azure.Management.Sql">
177-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.21.1-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
177+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.22.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
178178
</Reference>
179179
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
180180
<SpecificVersion>False</SpecificVersion>

src/ResourceManager/Sql/Commands.Sql/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Authentication" version="1.0.25-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Sql" version="0.21.1-prerelease" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Sql" version="0.22.0-prerelease" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
Binary file not shown.

0 commit comments

Comments
 (0)