Skip to content

Commit 16c3bda

Browse files
committed
Fix conflicts with master dev branch
Fixed Microsoft.Azure.Management.Resources NuGet package version
1 parent a4b70a5 commit 16c3bda

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.Resources" version="2.19.0-preview" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.StreamAnalytics" version="1.8.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.Framework" version="1.0.5896.19355-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5896.19355-prerelease" targetFramework="net45" />

src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.Resources" version="2.19.0-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.StreamAnalytics" version="1.8.0" 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" />

0 commit comments

Comments
 (0)