Skip to content

Commit 9ca6d5a

Browse files
yaakoviyunyaakoviyun
committed
Merge branch 'preview' of https://github.com/yaakoviyun/azure-powershell into preview
2 parents a2eeb0f + 24c8100 commit 9ca6d5a

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
27-
<PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.21.0-preview" />
27+
<PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.22.0-preview" />
2828
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.5.1-preview" />
2929
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.2.0-preview" />
3030
</ItemGroup>
@@ -47,4 +47,4 @@
4747
</None>
4848
</ItemGroup>
4949

50-
</Project>
50+
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.Management.Sql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.1.21.0-preview\lib\net452\Microsoft.Azure.Management.Sql.dll</HintPath>
56+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.1.22.0-preview\lib\net452\Microsoft.Azure.Management.Sql.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Management.Storage">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Network" version="19.5.1-preview" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
11-
<package id="Microsoft.Azure.Management.Sql" version="1.21.0-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Sql" version="1.22.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.Framework" version="3.0.0" targetFramework="net452" />
1414
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />
@@ -29,4 +29,4 @@
2929
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
3030
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
3131
<package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
32-
</packages>
32+
</packages>

‎src/ResourceManager/Sql/Commands.Sql/Commands.Sql.Netcore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.21.0-preview" />
31+
<PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.22.0-preview" />
3232
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.1-preview" />
3333
<PackageReference Include="System.Security.Permissions" Version="4.5.0" />
3434
</ItemGroup>
@@ -71,4 +71,4 @@
7171
<Content Include="help\**\*" CopyToOutputDirectory="PreserveNewest" />
7272
</ItemGroup>
7373

74-
</Project>
74+
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@
484484
<ItemGroup>
485485
<Reference Include="Microsoft.Azure.Management.Sql, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
486486
<SpecificVersion>False</SpecificVersion>
487-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.1.21.0-preview\lib\net452\Microsoft.Azure.Management.Sql.dll</HintPath>
487+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.1.22.0-preview\lib\net452\Microsoft.Azure.Management.Sql.dll</HintPath>
488488
<Private>True</Private>
489489
</Reference>
490490
<Reference Include="Microsoft.Azure.Management.Storage">

‎src/ResourceManager/Sql/Commands.Sql/VulnerabilityAssessment/Services/SqlVulnerabilityAssessmentAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public DatabaseVulnerabilityAssessmentSettingsModel SetDatabaseVulnerabilityAsse
7474

7575
}
7676

77-
/// <summary>
77+
/// <summary>
7878
/// Set settings with storage access key
7979
/// </summary>
8080
public DatabaseVulnerabilityAssessmentSettingsModel SetDatabaseVulnerabilityAssessmentSettingsWithStorageAccessKey(DatabaseVulnerabilityAssessmentSettingsModel model)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Azure.Management.Sql" version="1.21.0-preview" targetFramework="net452" />
3+
<package id="Microsoft.Azure.Management.Sql" version="1.22.0-preview" targetFramework="net452" />
44
<package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
55
<package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
66
<package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />

‎src/TestPrerequisites/Common.Test.Prerequisites/Common.TestPrerequisites.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.9.1-preview" PrivateAssets="All" />
7070
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.0.1" PrivateAssets="All" />
7171
<PackageReference Include="Microsoft.Azure.Management.ServiceFabric" Version="1.0.0.1-preview" PrivateAssets="All" />
72-
<PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.21.0-preview" PrivateAssets="All" />
72+
<PackageReference Include="Microsoft.Azure.Management.Sql" Version="1.22.0-preview" PrivateAssets="All" />
7373
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="8.1.1-preview" PrivateAssets="All" />
7474
<PackageReference Include="Microsoft.Azure.Management.StreamAnalytics" Version="2.0.1" PrivateAssets="All" />
7575
<PackageReference Include="Microsoft.Azure.Management.TrafficManager" Version="2.5.3" PrivateAssets="All" />
@@ -88,4 +88,4 @@
8888
</ItemGroup>
8989
</Target>
9090

91-
</Project>
91+
</Project>

0 commit comments

Comments
 (0)