Skip to content

Commit 9c48ff8

Browse files
safeermohammedsafeermohammed
committed
Resolving merge conflict in ResourceManager.sln
2 parents 276245b + 5d46f6f commit 9c48ff8

File tree

63 files changed

+4876
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+4876
-139
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 402 additions & 12 deletions
Large diffs are not rendered by default.

‎src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@
106106
<Reference Include="Microsoft.WindowsAzure.Management">
107107
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
108108
</Reference>
109-
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
109+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
110110
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
111+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
111112
</Reference>
112113
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
113114
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

‎src/Common/Commands.Common.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2121
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

‎src/Common/Commands.Common/ServiceManagementTypes.cs

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,21 @@ public AssignPublicIPCollection PublicIPs
863863
this.SetValue("PublicIPs", value);
864864
}
865865
}
866-
[DataMember(Name = "NetworkSecurityGroup", EmitDefaultValue = false, Order = 7)]
866+
867+
[DataMember(Name = "NetworkInterfaces", EmitDefaultValue = false, Order = 7)]
868+
public AssignNetworkInterfaceCollection NetworkInterfaces
869+
{
870+
get
871+
{
872+
return this.GetValue<AssignNetworkInterfaceCollection>("NetworkInterfaces");
873+
}
874+
set
875+
{
876+
this.SetValue("NetworkInterfaces", value);
877+
}
878+
}
879+
880+
[DataMember(Name = "NetworkSecurityGroup", EmitDefaultValue = false, Order = 8)]
867881
public string NetworkSecurityGroup
868882
{
869883
get
@@ -876,16 +890,16 @@ public string NetworkSecurityGroup
876890
}
877891
}
878892

879-
[DataMember(Name = "NetworkInterfaces", EmitDefaultValue = false, Order = 7)]
880-
public AssignNetworkInterfaceCollection NetworkInterfaces
893+
[DataMember(Name = "IPForwarding", EmitDefaultValue = false, Order = 9)]
894+
public string IPForwarding
881895
{
882896
get
883897
{
884-
return this.GetValue<AssignNetworkInterfaceCollection>("NetworkInterfaces");
898+
return this.GetValue<string>("IPForwarding");
885899
}
886900
set
887901
{
888-
this.SetValue("NetworkInterfaces", value);
902+
this.SetValue("IPForwarding", value);
889903
}
890904
}
891905
}
@@ -948,6 +962,8 @@ public AssignIPConfigurationCollection IPConfigurations
948962
}
949963
}
950964

965+
[DataMember(Name = "IPForwarding", EmitDefaultValue = false, Order = 4)]
966+
public string IPForwarding { get; set; }
951967
}
952968

953969
[CollectionDataContract(Name = "IPConfigurations", ItemName = "IPConfiguration", Namespace = Constants.ServiceManagementNS)]

‎src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@
102102
<Reference Include="Microsoft.WindowsAzure.Management">
103103
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
104104
</Reference>
105-
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
106-
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
107-
<Private>True</Private>
105+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
106+
<SpecificVersion>False</SpecificVersion>
107+
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
108108
</Reference>
109109
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
110110
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.1.1\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>

‎src/Common/Commands.ScenarioTest/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
20-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.WebSites" version="4.4.2-prerelease" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />

‎src/ResourceManager.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights.Test", "R
5959
EndProject
6060
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation", "ResourceManager\Automation\Commands.Automation\Commands.ResourceManagement.Automation.csproj", "{90DEF35A-F7FF-40D0-B008-F489A4C092DB}"
6161
EndProject
62+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "ResourceManager\Dns\Commands.Dns\Commands.Dns.csproj", "{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}"
63+
EndProject
64+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "ResourceManager\Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{133561EC-99AF-4ADC-AF41-39C4D3AD323B}"
65+
EndProject
6266
Global
6367
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6468
Debug|Any CPU = Debug|Any CPU
@@ -161,6 +165,14 @@ Global
161165
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
162166
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
163167
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.Build.0 = Release|Any CPU
168+
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169+
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
170+
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
171+
{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.Build.0 = Release|Any CPU
172+
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
173+
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.Build.0 = Debug|Any CPU
174+
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.ActiveCfg = Release|Any CPU
175+
{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.Build.0 = Release|Any CPU
164176
EndGlobalSection
165177
GlobalSection(SolutionProperties) = preSolution
166178
HideSolutionNode = FALSE
@@ -177,5 +189,8 @@ Global
177189
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
178190
{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
179191
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
192+
{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
193+
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
194+
{133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
180195
EndGlobalSection
181196
EndGlobal

‎src/ResourceManager/Dns/Commands.Dns/Records/GetAzureDnsRescordSet.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ public override void ExecuteCmdlet()
6363

6464
if (this.ParameterSetName == "Fields")
6565
{
66+
if (this.ZoneName.EndsWith("."))
67+
{
68+
this.ZoneName = this.ZoneName.TrimEnd('.');
69+
this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.ZoneName));
70+
}
71+
6672
zoneName = this.ZoneName;
6773
resourceGroupName = this.ResourceGroupName;
6874
}
@@ -79,6 +85,12 @@ public override void ExecuteCmdlet()
7985
throw new PSArgumentException("If you specify the Name parameter you must also specify the RecordType parameter.");
8086
}
8187

88+
if (this.Name.EndsWith("."))
89+
{
90+
this.Name = this.Name.TrimEnd('.');
91+
this.WriteWarning(string.Format("Modifying recordset name to remove terminating '.'. Recordset name used is \"{0}\".", this.Name));
92+
}
93+
8294
DnsRecordSet result = this.DnsClient.GetDnsRecordSet(this.Name, zoneName, resourceGroupName, recordType);
8395
this.WriteObject(result);
8496
}

‎src/ResourceManager/Dns/Commands.Dns/Records/NewAzureDnsRescordSet.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ public override void ExecuteCmdlet()
6969

7070
if (ParameterSetName == "Fields")
7171
{
72+
if (this.ZoneName.EndsWith("."))
73+
{
74+
this.ZoneName = this.ZoneName.TrimEnd('.');
75+
this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.ZoneName));
76+
}
77+
7278
zoneName = this.ZoneName;
7379
resourceGroupname = this.ResourceGroupName;
7480
}
@@ -78,6 +84,12 @@ public override void ExecuteCmdlet()
7884
resourceGroupname = this.Zone.ResourceGroupName;
7985
}
8086

87+
if (this.Name.EndsWith("."))
88+
{
89+
this.Name = this.Name.TrimEnd('.');
90+
this.WriteWarning(string.Format("Modifying recordset name to remove terminating '.'. Recordset name used is \"{0}\".", this.Name));
91+
}
92+
8193
ConfirmAction(
8294
!Overwrite.IsPresent || Force.IsPresent,
8395
string.Format(ProjectResources.Confirm_OverwriteRecord, this.Name, this.RecordType, zoneName),

‎src/ResourceManager/Dns/Commands.Dns/Records/RemoveAzureDnsRecordSet.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@ public override void ExecuteCmdlet()
6969

7070
if (this.ParameterSetName == "Fields")
7171
{
72+
if (this.Name.EndsWith("."))
73+
{
74+
this.Name = this.Name.TrimEnd('.');
75+
this.WriteWarning(string.Format("Modifying recordset name to remove terminating '.'. Recordset name used is \"{0}\".", this.Name));
76+
}
77+
78+
if (this.ZoneName.EndsWith("."))
79+
{
80+
this.ZoneName = this.ZoneName.TrimEnd('.');
81+
this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.ZoneName));
82+
}
83+
7284
recordSetToDelete = new DnsRecordSet
7385
{
7486
Name = this.Name,
@@ -80,6 +92,12 @@ public override void ExecuteCmdlet()
8092
}
8193
else if (this.ParameterSetName == "Mixed")
8294
{
95+
if (this.Name.EndsWith("."))
96+
{
97+
this.Name = this.Name.TrimEnd('.');
98+
this.WriteWarning(string.Format("Modifying recordset name to remove terminating '.'. Recordset name used is \"{0}\".", this.Name));
99+
}
100+
83101
recordSetToDelete = new DnsRecordSet
84102
{
85103
Name = this.Name,

‎src/ResourceManager/Dns/Commands.Dns/Zones/GetAzureDnsZone.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,17 @@ public override void ExecuteCmdlet()
3636
{
3737
if (this.Name != null)
3838
{
39-
WriteObject(this.DnsClient.GetDnsZone(this.Name, this.ResourceGroupName));
39+
if (this.Name.EndsWith("."))
40+
{
41+
this.Name = this.Name.TrimEnd('.');
42+
this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.Name));
43+
}
44+
45+
this.WriteObject(this.DnsClient.GetDnsZone(this.Name, this.ResourceGroupName));
4046
}
4147
else
4248
{
43-
WriteObject(this.DnsClient.ListDnsZones(this.ResourceGroupName));
49+
this.WriteObject(this.DnsClient.ListDnsZones(this.ResourceGroupName));
4450
}
4551
}
4652
}

‎src/ResourceManager/Dns/Commands.Dns/Zones/NewAzureDnsZone.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,16 @@ public class NewAzureDnsZone : DnsBaseCmdlet
4040

4141
public override void ExecuteCmdlet()
4242
{
43+
if (this.Name.EndsWith("."))
44+
{
45+
this.Name = this.Name.TrimEnd('.');
46+
this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.Name));
47+
}
48+
4349
DnsZone result = this.DnsClient.CreateDnsZone(this.Name, this.ResourceGroupName, this.Tag);
44-
WriteVerbose(ProjectResources.Success);
45-
WriteVerbose(string.Format(ProjectResources.Success_NewZone, this.Name, this.ResourceGroupName));
46-
WriteObject(result);
50+
this.WriteVerbose(ProjectResources.Success);
51+
this.WriteVerbose(string.Format(ProjectResources.Success_NewZone, this.Name, this.ResourceGroupName));
52+
this.WriteObject(result);
4753
}
4854
}
4955
}

‎src/ResourceManager/Dns/Commands.Dns/Zones/RemoveAzureDnsZone.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ public override void ExecuteCmdlet()
5555

5656
if (this.ParameterSetName == "Fields")
5757
{
58+
if (this.Name.EndsWith("."))
59+
{
60+
this.Name = this.Name.TrimEnd('.');
61+
this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.Name));
62+
}
63+
5864
zoneToDelete = new DnsZone
5965
{
6066
Name = this.Name,
@@ -64,12 +70,12 @@ public override void ExecuteCmdlet()
6470
}
6571
else if (this.ParameterSetName == "Object")
6672
{
67-
zoneToDelete = this.Zone;
68-
6973
if ((string.IsNullOrWhiteSpace(this.Zone.Etag) || this.Zone.Etag == "*") && !this.IgnoreEtag.IsPresent)
7074
{
7175
throw new PSArgumentException(string.Format(ProjectResources.Error_EtagNotSpecified, typeof(DnsZone).Name));
7276
}
77+
78+
zoneToDelete = this.Zone;
7379
}
7480

7581
bool ignoreEtag = this.IgnoreEtag.IsPresent || this.ParameterSetName != "Object";

‎src/ResourceManager/Dns/Commands.Dns/Zones/SetAzureDnsZone.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ public override void ExecuteCmdlet()
5252

5353
if (this.ParameterSetName == "Fields")
5454
{
55+
if (this.Name.EndsWith("."))
56+
{
57+
this.Name = this.Name.TrimEnd('.');
58+
this.WriteWarning(string.Format("Modifying zone name to remove terminating '.'. Zone name used is \"{0}\".", this.Name));
59+
}
60+
5561
zoneToUpdate = new DnsZone
5662
{
5763
Name = this.Name,

‎src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ NestedModules = @(
7878
'.\DataFactories\Microsoft.Azure.Commands.DataFactories.dll',
7979
'.\RedisCache\Microsoft.Azure.Commands.RedisCache.dll',
8080
'.\Batch\Microsoft.Azure.Commands.Batch.dll',
81-
'.\Dns\Microsoft.Azure.Commands.Dns.dll'
81+
'.\Dns\Microsoft.Azure.Commands.Dns.dll',
8282
'.\KeyVault\Microsoft.Azure.Commands.KeyVault.dll',
8383
'.\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll',
8484
'.\Insights\Microsoft.Azure.Commands.Insights.dll',

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/Commands.ServiceManagement.Extensions.Test.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@
7979
<Reference Include="Microsoft.WindowsAzure.Management">
8080
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
8181
</Reference>
82-
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
82+
<Reference Include="Microsoft.WindowsAzure.Management.Compute">
83+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
8584
</Reference>
8685
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
8786
<SpecificVersion>False</SpecificVersion>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.14.201151115" targetFramework="net45" />
1212
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1313
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
14-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
14+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
1515
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
1616
<package id="xunit.runner.visualstudio" version="2.0.0" targetFramework="net45" />
1717
</packages>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@
111111
<Reference Include="Microsoft.WindowsAzure.Management">
112112
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
113113
</Reference>
114+
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=12.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115+
<SpecificVersion>False</SpecificVersion>
116+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.1.0-preview\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
117+
</Reference>
114118
<Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115119
<SpecificVersion>False</SpecificVersion>
116120
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.11.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1717
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
19-
<package id="Microsoft.WindowsAzure.Management.Compute" version="11.2.1" targetFramework="net45" />
19+
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.1.0-preview" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Storage" version="5.1.1" targetFramework="net45" />
2121
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
2222
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />

0 commit comments

Comments
 (0)