Skip to content

Commit 18e507c

Browse files
levhayrlevhayr
committed
Pull/merge latest changes from central repository
2 parents c4dc718 + 967e5bc commit 18e507c

File tree

222 files changed

+31880
-409
lines changed

Some content is hidden

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

222 files changed

+31880
-409
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 528 additions & 16 deletions
Large diffs are not rendered by default.

‎src/AzurePowershell.sln

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights.Test", "R
168168
EndProject
169169
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites", "ResourceManager\Websites\Commands.Websites\Commands.Websites.csproj", "{80A92297-7C92-456B-8EE7-9FB6CE30149D}"
170170
EndProject
171+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation", "ResourceManager\Automation\Commands.Automation\Commands.ResourceManagement.Automation.csproj", "{90DEF35A-F7FF-40D0-B008-F489A4C092DB}"
172+
EndProject
171173
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "ResourceManager\Websites\Commands.Websites.Test\Commands.Websites.Test.csproj", "{13E031E4-8A43-4B87-9D72-D70180C31C11}"
172174
EndProject
173175
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RemoteApp", "ServiceManagement\RemoteApp\Commands.RemoteApp\Commands.RemoteApp.csproj", "{492D2AF2-950B-4F2E-8079-8794305313FD}"
@@ -420,6 +422,14 @@ Global
420422
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.Build.0 = Debug|Any CPU
421423
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.ActiveCfg = Release|Any CPU
422424
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.Build.0 = Release|Any CPU
425+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
426+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
427+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
428+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.Build.0 = Release|Any CPU
429+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
430+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
431+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
432+
{492D2AF2-950B-4F2E-8079-8794305313FD}.Release|Any CPU.Build.0 = Release|Any CPU
423433
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
424434
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.Build.0 = Debug|Any CPU
425435
{13E031E4-8A43-4B87-9D72-D70180C31C11}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎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: 24 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,11 @@ public AssignIPConfigurationCollection IPConfigurations
948962
}
949963
}
950964

965+
[DataMember(Name = "NetworkSecurityGroup", EmitDefaultValue = false, Order = 3)]
966+
public string NetworkSecurityGroup { get; set; }
967+
968+
[DataMember(Name = "IPForwarding", EmitDefaultValue = false, Order = 4)]
969+
public string IPForwarding { get; set; }
951970
}
952971

953972
[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/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ namespace Microsoft.WindowsAzure.Commands.ScenarioTest
3232
public class EnvironmentSetupHelper
3333
{
3434
private static string testEnvironmentName = "__test-environment";
35-
35+
3636
private static string testSubscriptionName = "__test-subscriptions";
37-
37+
3838
private AzureSubscription testSubscription;
39-
39+
4040
private AzureAccount testAccount;
4141

4242
private const string PackageDirectory = @"..\..\..\..\..\Package\Debug";
4343

4444
protected List<string> modules;
45-
45+
4646
protected ProfileClient ProfileClient { get; set; }
4747

4848
public EnvironmentSetupHelper()

‎src/ResourceManager.sln

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.21005.1
3+
VisualStudioVersion = 12.0.31101.0
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
66
ProjectSection(SolutionItems) = preProject
@@ -49,12 +49,20 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Te
4949
EndProject
5050
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights", "ResourceManager\Insights\Commands.Insights\Commands.Insights.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}"
5151
EndProject
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Automation.Test", "ResourceManager\Automation\Commands.Automation.Test\Commands.Automation.Test.csproj", "{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}"
53+
EndProject
5254
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites", "ResourceManager\Websites\Commands.Websites\Commands.Websites.csproj", "{80A92297-7C92-456B-8EE7-9FB6CE30149D}"
5355
EndProject
5456
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "ResourceManager\Websites\Commands.Websites.Test\Commands.Websites.Test.csproj", "{F4ABAD68-64A5-4B23-B09C-42559A7524DE}"
5557
EndProject
5658
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights.Test", "ResourceManager\Insights\Commands.Insights.Test\Commands.Insights.Test.csproj", "{469F20E0-9D40-41AD-94C3-B47AD15A4C00}"
5759
EndProject
60+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation", "ResourceManager\Automation\Commands.Automation\Commands.ResourceManagement.Automation.csproj", "{90DEF35A-F7FF-40D0-B008-F489A4C092DB}"
61+
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
5866
Global
5967
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6068
Debug|Any CPU = Debug|Any CPU
@@ -137,6 +145,10 @@ Global
137145
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU
138146
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU
139147
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU
148+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
150+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
151+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.Build.0 = Release|Any CPU
140152
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
141153
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.Build.0 = Debug|Any CPU
142154
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -149,6 +161,18 @@ Global
149161
{469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Debug|Any CPU.Build.0 = Debug|Any CPU
150162
{469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Release|Any CPU.ActiveCfg = Release|Any CPU
151163
{469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Release|Any CPU.Build.0 = Release|Any CPU
164+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
166+
{90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
167+
{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
152176
EndGlobalSection
153177
GlobalSection(SolutionProperties) = preSolution
154178
HideSolutionNode = FALSE
@@ -162,7 +186,11 @@ Global
162186
{080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
163187
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
164188
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
189+
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
190+
{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
165191
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
166192
{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}
167195
EndGlobalSection
168196
EndGlobal

0 commit comments

Comments
 (0)