Skip to content

Commit e6696f0

Browse files
committed
Getting latest changes
Getting latest changes
1 parent df3a8d1 commit e6696f0

File tree

1,765 files changed

+78471
-48323
lines changed

Some content is hidden

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

1,765 files changed

+78471
-48323
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,5 @@ UpgradeLog*.htm
192192

193193
# Microsoft Fakes
194194
FakesAssemblies/
195+
196+
.vs/

AzurePowershell.Test.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
<ItemGroup>
4646
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
47-
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
47+
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
4848
<XUnitTests Include=".\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
4949
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
5050
<XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
@@ -81,7 +81,7 @@
8181
<Message Importance="high" Text="Running XUnit tests" />
8282
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
8383
<Exec
84-
Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -trait &quot;AcceptanceType=CheckIn&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
84+
Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -parallel none -maxthreads 0 -trait &quot;AcceptanceType=CheckIn&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
8585
Timeout="$(TestTimeout)" ContinueOnError="false"/>
8686
<OnError ExecuteTargets="TimeoutErrorHandler"/>
8787
</Target>

ChangeLog.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* Changed the output format of Get image cmdlets as a table
88
* Fixed Set-AzureVMAccessExtension cmdlet
99
* Azure Compute (Service Management) cmdlets
10-
* Changed the warning message to a non-terminating error message for ResourceNotFound in VM cmdlets
1110
* Exposed ComputeImageConfig in Get-AzurePlatformVMImage cmdlet
1211
* Fixed Publish-AzurePlatformExtension and Set-AzurePlatformExtension cmdlets
1312
* Azure Backup - added the following cmdlets
@@ -35,6 +34,21 @@
3534
* Stop-AzureBatchJob
3635
* Stop-AzureBatchJobSchedule
3736
* Stop-AzureBatchTask
37+
* Azure Data Factory
38+
* Update SDK reference to 3.0.0 to use API version 2015-09-01
39+
* Imposes message size limits for all authoring types. Pipelines must be 200 KB or less in size and all others must be 30 KB or less.
40+
* TeradataLinkedService no longer accepts the obsolete properties "database" and "schema".
41+
* Obsolete copy-related properties are no longer returned from the service.
42+
* Azure Sql (ARM) Cmdlets - added the following cmdlets
43+
* Get-AzureSqlServerActiveDirectoryAdministrator
44+
* Set-AzureSqlServerActiveDirectoryAdministrator
45+
* Remove-AzureSqlServerActiveDirectoryAdministrator
46+
* SQL Server VM cmdlets (ARM)
47+
* New-AzureVMSqlServerAutoPatchingConfig
48+
* New-AzureVMSqlServerAutoBackupConfig
49+
* Set-AzureVMSqlServerExtension
50+
* Get-AzureVMSqlServerExtension
51+
* Remove-AzureVMSqlServerExtension
3852

3953
## 2015.08.17 version 0.9.7
4054
* Azure Profile cmdlets

build.proj

Lines changed: 54 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,36 @@
2020
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel>
2121
</PropertyGroup>
2222
<ItemGroup>
23-
<AzurePowerShellSln Include=".\src\AzurePowerShell.sln" />
23+
<AzureResourceManagerSln Include=".\src\ResourceManager.sln" />
24+
<AzureServiceManagementSln Include=".\src\ServiceManagement.sln" />
2425
<SetupSln Include=".\setup\azurepowershell.sln" />
2526
</ItemGroup>
2627

2728
<UsingTask
28-
AssemblyFile="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.runner.msbuild.dll"
29+
AssemblyFile="$(MSBuildProjectDirectory)\src\packages\xunit.MSBuild.2.0.0.0\tools\xunit.runner.msbuild.dll"
2930
TaskName="Xunit.Runner.MSBuild.xunit" />
3031

3132
<!-- Clean the build in all configurations -->
3233
<Target Name="Clean">
3334
<!-- Clean the solutions -->
3435
<Message Importance="high" Text="Cleaning Cmdlets..." ContinueOnError="false" />
3536
<MSBuild
36-
Projects="@(AzurePowerShellSln)"
37+
Projects="@(AzureResourceManagerSln)"
3738
Targets="Clean"
3839
Properties="$(DebugBuildConfig)"
3940
ContinueOnError="false" />
4041
<MSBuild
41-
Projects="@(AzurePowerShellSln)"
42+
Projects="@(AzureResourceManagerSln)"
43+
Targets="Clean"
44+
Properties="$(ReleaseBuildConfig)"
45+
ContinueOnError="false" />
46+
<MSBuild
47+
Projects="@(AzureServiceManagementSln)"
48+
Targets="Clean"
49+
Properties="$(DebugBuildConfig)"
50+
ContinueOnError="false" />
51+
<MSBuild
52+
Projects="@(AzureServiceManagementSln)"
4253
Targets="Clean"
4354
Properties="$(ReleaseBuildConfig)"
4455
ContinueOnError="false" />
@@ -47,7 +58,7 @@
4758
Targets="Clean"
4859
Properties="$(DebugBuildConfig)"
4960
ContinueOnError="false" />
50-
61+
5162
<!-- Delete the publish files -->
5263
<Message Importance="high" Text="Cleaning publish files..." ContinueOnError="false" />
5364
<ItemGroup>
@@ -74,9 +85,9 @@
7485
</Target>
7586

7687
<PropertyGroup>
77-
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
78-
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
79-
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
88+
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
89+
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
90+
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
8091
</PropertyGroup>
8192

8293
<!--
@@ -88,7 +99,7 @@
8899
<NuGetCache Include="$(LOCALAPPDATA)\NuGet\Cache\*.nupkg"/>
89100
</ItemGroup>
90101

91-
<!-- Delete NuGet cache-->
102+
<!-- Delete NuGet cache-->
92103
<Delete Files="@(NuGetCache)" />
93104

94105
<Delete Files="$(NuGetRestoreConfigFile)" />
@@ -101,7 +112,8 @@
101112
<Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
102113

103114
<!-- Restore packages -->
104-
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
115+
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\ResourceManager.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
116+
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\ServiceManagement.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
105117

106118
<!--Restore the xunit runner needed to run unit tests-->
107119
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
@@ -113,13 +125,25 @@
113125
<Target Name="BuildCmdlets" DependsOnTargets="ForceRestorePackages">
114126
<Message Importance="high" Text="Building Cmdlets..." />
115127
<MSBuild
116-
Projects="@(AzurePowerShellSln)"
128+
Projects="@(AzureResourceManagerSln)"
117129
Targets="Build"
118130
Properties="$(DebugBuildConfig)"
119131
BuildInParallel="$(BuildInParallel)"
120132
ContinueOnError="false" />
121133
<MSBuild
122-
Projects="@(AzurePowerShellSln)"
134+
Projects="@(AzureResourceManagerSln)"
135+
Targets="Build"
136+
Properties="$(ReleaseBuildConfig)"
137+
BuildInParallel="$(BuildInParallel)"
138+
ContinueOnError="false" />
139+
<MSBuild
140+
Projects="@(AzureServiceManagementSln)"
141+
Targets="Build"
142+
Properties="$(DebugBuildConfig)"
143+
BuildInParallel="$(BuildInParallel)"
144+
ContinueOnError="false" />
145+
<MSBuild
146+
Projects="@(AzureServiceManagementSln)"
123147
Targets="Build"
124148
Properties="$(ReleaseBuildConfig)"
125149
BuildInParallel="$(BuildInParallel)"
@@ -136,11 +160,11 @@
136160
Importance="high"
137161
Text="You are required to have installed the WiX Toolset at http://wix.codeplex.com/releases/view/115492 (Wix38.msi)"
138162
ContinueOnError="false" />
139-
<MSBuild
163+
<!--<MSBuild
140164
Projects="@(SetupSln)"
141165
Targets="Build"
142166
Properties="$(DebugBuildConfig)"
143-
ContinueOnError="false" />
167+
ContinueOnError="false" />-->
144168
</Target>
145169

146170
<!-- Build the Setup -->
@@ -153,11 +177,11 @@
153177
Importance="high"
154178
Text="You are required to have installed the WiX Toolset at http://wix.codeplex.com/releases/view/115492 (Wix38.msi)"
155179
ContinueOnError="false" />
156-
<MSBuild
180+
<!--<MSBuild
157181
Projects="@(SetupSln)"
158182
Targets="Build"
159183
Properties="$(ReleaseBuildConfig)"
160-
ContinueOnError="false" />
184+
ContinueOnError="false" />-->
161185
</Target>
162186

163187
<!-- Build the Cmdlets and Setup in all configurations -->
@@ -171,7 +195,13 @@
171195
<Target Name="BuildRelease" DependsOnTargets="ForceRestorePackages">
172196
<Message Importance="high" Text="Building Cmdlets in Release config..." />
173197
<MSBuild
174-
Projects="@(AzurePowerShellSln)"
198+
Projects="@(AzureResourceManagerSln)"
199+
Targets="Build"
200+
Properties="$(ReleaseBuildConfig)"
201+
BuildInParallel="$(BuildInParallel)"
202+
ContinueOnError="false" />
203+
<MSBuild
204+
Projects="@(AzureServiceManagementSln)"
175205
Targets="Build"
176206
Properties="$(ReleaseBuildConfig)"
177207
BuildInParallel="$(BuildInParallel)"
@@ -182,7 +212,13 @@
182212
<Target Name="BuildDebug" DependsOnTargets="ForceRestorePackages">
183213
<Message Importance="high" Text="Building Cmdlets in Debug config..." />
184214
<MSBuild
185-
Projects="@(AzurePowerShellSln)"
215+
Projects="@(AzureResourceManagerSln)"
216+
Targets="Build"
217+
Properties="$(DebugBuildConfig)"
218+
BuildInParallel="$(BuildInParallel)"
219+
ContinueOnError="false" />
220+
<MSBuild
221+
Projects="@(AzureServiceManagementSln)"
186222
Targets="Build"
187223
Properties="$(DebugBuildConfig)"
188224
BuildInParallel="$(BuildInParallel)"

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 - August 2015" ?>
4+
<?define productName="Microsoft Azure PowerShell - September 2015" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

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

0 commit comments

Comments
 (0)