Skip to content

Commit b095898

Browse files
yaakoviyunyaakoviyun
committed
Merge pull request #3 from Azure/build
update from upstream
2 parents 6e3b152 + 8cbdb07 commit b095898

File tree

13 files changed

+1001
-991
lines changed

13 files changed

+1001
-991
lines changed

‎setup/azurecmd.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33

4-
<?define productName="Microsoft Azure PowerShell - March 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - April 2015" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.8.16.1" ?>
8+
<?define version="0.9.0" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

‎src/Common/Commands.Common/AzurePowerShell.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ public class AzurePowerShell
2727

2828
public const string AssemblyCopyright = "Copyright © Microsoft";
2929

30-
public const string AssemblyVersion = "0.8.16.1";
30+
public const string AssemblyVersion = "0.9.0";
3131

32-
public const string AssemblyFileVersion = "0.8.16.1";
32+
public const string AssemblyFileVersion = "0.9.0";
3333

3434
public const string ProfileFile = "AzureProfile.json";
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.8.16.1'
12+
ModuleVersion = '0.9.0'
1313

1414
# ID used to uniquely identify this module
1515
GUID = '81d522a4-6e5d-4105-8f58-376204c47458'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
<Reference Include="Microsoft.Azure.Gallery">
6161
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Microsoft.Azure.Management.Authorization, Version=0.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<Reference Include="Microsoft.Azure.Management.Authorization, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.0-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
65+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Microsoft.Azure.Management.Sql">
6868
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.22.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>

‎src/ResourceManager/Sql/Commands.Sql.Test/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.Gallery" version="2.6.2-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Authorization" version="0.18.0-preview" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Authorization" version="0.18.2-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.18.0-preview" targetFramework="net45" />
1010
<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" />

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/DSC/DscExtensionConfigurationParsingHelperTests.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public void TestGetModuleNameForDscResourceXADDomain()
9292
Assert.AreEqual("xActiveDirectory", moduleName);
9393
}
9494

95+
[Ignore]
9596
[TestMethod]
9697
[TestCategory("Scenario")]
9798
[TestCategory("x64_only")]
@@ -104,6 +105,7 @@ public void TestExtractConfigurationNames1()
104105
Assert.AreEqual("xComputerManagement", results.RequiredModules[0]);
105106
}
106107

108+
[Ignore]
107109
[TestMethod]
108110
[TestCategory("Scenario")]
109111
[TestCategory("x64_only")]
@@ -117,6 +119,7 @@ public void TestExtractConfigurationNames2()
117119
Assert.AreEqual("xActiveDirectory", results.RequiredModules[1]);
118120
}
119121

122+
[Ignore]
120123
[TestMethod]
121124
[TestCategory("Scenario")]
122125
[TestCategory("x64_only")]
@@ -129,6 +132,7 @@ public void TestExtractConfigurationNames3()
129132
Assert.AreEqual("xPSDesiredStateConfiguration", results.RequiredModules[0]);
130133
}
131134

135+
[Ignore]
132136
[TestMethod]
133137
[TestCategory("Scenario")]
134138
[TestCategory("x64_only")]
@@ -143,6 +147,7 @@ public void TestExtractConfigurationNamesMulti()
143147
Assert.AreEqual("xPSDesiredStateConfiguration", results.RequiredModules[2]);
144148
}
145149

150+
[Ignore]
146151
[TestMethod]
147152
[TestCategory("Scenario")]
148153
[TestCategory("x64_only")]
@@ -156,6 +161,7 @@ public void TestNameImportListInsideNode()
156161
Assert.AreEqual("xActiveDirectory", results.RequiredModules[1]);
157162
}
158163

164+
[Ignore]
159165
[TestMethod]
160166
[TestCategory("Scenario")]
161167
[TestCategory("x64_only")]
@@ -169,6 +175,7 @@ public void TestNameImportListOutsideNode()
169175
Assert.AreEqual("xActiveDirectory", results.RequiredModules[1]);
170176
}
171177

178+
[Ignore]
172179
[TestMethod]
173180
[TestCategory("Scenario")]
174181
[TestCategory("x64_only")]
@@ -181,6 +188,7 @@ public void TestNameImportSingleInsideNode()
181188
Assert.AreEqual("xComputerManagement", results.RequiredModules[0]);
182189
}
183190

191+
[Ignore]
184192
[TestMethod]
185193
[TestCategory("Scenario")]
186194
[TestCategory("x64_only")]
@@ -205,6 +213,7 @@ public void TestNameModuleImportSingleInsideNode()
205213
Assert.AreEqual("xComputerManagement", results.RequiredModules[0]);
206214
}
207215

216+
[Ignore]
208217
[TestMethod]
209218
[TestCategory("Scenario")]
210219
[TestCategory("x64_only")]
@@ -218,6 +227,7 @@ public void TestModuleImportListInsideNode()
218227
Assert.AreEqual("xNetworking", results.RequiredModules[1]);
219228
}
220229

230+
[Ignore]
221231
[TestMethod]
222232
[TestCategory("Scenario")]
223233
[TestCategory("x64_only")]

‎src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/PIR.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ModuleToProcess = '.\Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.8.16.1'
15+
ModuleVersion = '0.9.0'
1616

1717
# ID used to uniquely identify this module
1818
GUID = 'a9343cbd-175c-4f72-90c7-2abe9b300644'

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/AzurePreview.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ModuleToProcess = '.\Microsoft.WindowsAzure.Commands.ServiceManagement.Preview.dll'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.8.16.1'
15+
ModuleVersion = '0.9.0'
1616

1717
# ID used to uniquely identify this module
1818
GUID = '1C72E555-E83F-45E4-AED2-AF3278828DCD'

‎src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRoute.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ModuleToProcess = '.\Microsoft.WindowsAzure.Commands.ExpressRoute.dll'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.8.16.1'
15+
ModuleVersion = '0.9.0'
1616

1717
# ID used to uniquely identify this module
1818
GUID = 'e5b10573-30da-456a-9319-4c0a5f8bed4a'

‎src/ServiceManagement/Services/Commands.Utilities/Azure.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '0.8.16.1'
12+
ModuleVersion = '0.9.0'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'D48CF693-4125-4D2D-8790-1514F44CE325'

0 commit comments

Comments
 (0)