Skip to content

Commit 8d819ba

Browse files
author
Jianghao Lu
committed
Merge pull request #887 from ljhljh235/asmpsget
Fix build for Service Mgmt and Resource Mgmt slns
2 parents 2d14ea8 + 66c6979 commit 8d819ba

File tree

19 files changed

+752
-97
lines changed

19 files changed

+752
-97
lines changed

‎AzurePowershell.Test.targets

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
<ItemGroup>
4646
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
4747
<XUnitTests Include=".\src\ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\bin\Debug\Microsoft.Azure.Commands.SiteRecovery.Test.dll"/>
48-
<!--<XUnitTests Include=".\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>-->
48+
<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"/>
50-
<!--<XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>-->
51-
<!--<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>-->
50+
<XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
51+
<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
5252
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
5353
<XUnitTests Include=".\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll"/>
5454
<XUnitTests Include=".\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll"/>
@@ -60,12 +60,12 @@
6060
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
6161
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
6262
<XUnitTests Include=".\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
63-
<!--<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>-->
64-
<!--<XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>-->
65-
<!--<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>-->
66-
<!--<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>-->
63+
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
64+
<XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>
65+
<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
66+
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
6767
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
68-
<!--<XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>-->
68+
<XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
6969
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
7070
</ItemGroup>
7171

‎build.proj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Targets="Clean"
4444
Properties="$(ReleaseBuildConfig)"
4545
ContinueOnError="false" />
46-
<!--<MSBuild
46+
<MSBuild
4747
Projects="@(AzureServiceManagementSln)"
4848
Targets="Clean"
4949
Properties="$(DebugBuildConfig)"
@@ -52,7 +52,7 @@
5252
Projects="@(AzureServiceManagementSln)"
5353
Targets="Clean"
5454
Properties="$(ReleaseBuildConfig)"
55-
ContinueOnError="false" />-->
55+
ContinueOnError="false" />
5656
<MSBuild
5757
Projects="@(SetupSln)"
5858
Targets="Clean"
@@ -135,7 +135,7 @@
135135
Properties="$(ReleaseBuildConfig)"
136136
BuildInParallel="$(BuildInParallel)"
137137
ContinueOnError="false" />
138-
<!--<MSBuild
138+
<MSBuild
139139
Projects="@(AzureServiceManagementSln)"
140140
Targets="Build"
141141
Properties="$(DebugBuildConfig)"
@@ -146,7 +146,7 @@
146146
Targets="Build"
147147
Properties="$(ReleaseBuildConfig)"
148148
BuildInParallel="$(BuildInParallel)"
149-
ContinueOnError="false" />-->
149+
ContinueOnError="false" />
150150
</Target>
151151

152152
<!-- Build the Setup -->
@@ -199,12 +199,12 @@
199199
Properties="$(ReleaseBuildConfig)"
200200
BuildInParallel="$(BuildInParallel)"
201201
ContinueOnError="false" />
202-
<!--<MSBuild
202+
<MSBuild
203203
Projects="@(AzureServiceManagementSln)"
204204
Targets="Build"
205205
Properties="$(ReleaseBuildConfig)"
206206
BuildInParallel="$(BuildInParallel)"
207-
ContinueOnError="false" />-->
207+
ContinueOnError="false" />
208208
</Target>
209209

210210
<!-- Build the Cmdlets in Debug configuration -->
@@ -216,12 +216,12 @@
216216
Properties="$(DebugBuildConfig)"
217217
BuildInParallel="$(BuildInParallel)"
218218
ContinueOnError="false" />
219-
<!--<MSBuild
219+
<MSBuild
220220
Projects="@(AzureServiceManagementSln)"
221221
Targets="Build"
222222
Properties="$(DebugBuildConfig)"
223223
BuildInParallel="$(BuildInParallel)"
224-
ContinueOnError="false" />-->
224+
ContinueOnError="false" />
225225
</Target>
226226

227227
<PropertyGroup>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@
190190
<Compile Include="Common\SimpleServiceManagementAsyncResult.cs" />
191191
<Compile Include="Common\ConversionUtilitiesTests.cs" />
192192
<Compile Include="Common\Testing.cs" />
193-
<Compile Include="Mocks\MockCommandRuntime.cs" />
194193
<Compile Include="Properties\AssemblyInfo.cs" />
195194
<Compile Include="Properties\Resources.Designer.cs">
196195
<AutoGen>True</AutoGen>
@@ -209,10 +208,6 @@
209208
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
210209
<Name>Commands.Common</Name>
211210
</ProjectReference>
212-
<ProjectReference Include="..\Commands.Profile\Commands.Profile.csproj">
213-
<Project>{c60342b1-47d3-4a0e-8081-9b97ce60b7af}</Project>
214-
<Name>Commands.Profile</Name>
215-
</ProjectReference>
216211
<ProjectReference Include="..\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
217212
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>
218213
<Name>Commands.ScenarioTests.Common</Name>

‎src/Common/Commands.Profile/Commands.Profile.csproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<DebugSymbols>true</DebugSymbols>
2020
<DebugType>full</DebugType>
2121
<Optimize>false</Optimize>
22-
<OutputPath>bin\Debug\</OutputPath>
22+
<OutputPath>..\..\Package\Debug\ServiceManagement\Azure\Services</OutputPath>
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
2828
<Prefer32Bit>false</Prefer32Bit>
2929
</PropertyGroup>
3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
31-
<OutputPath>bin\Release\</OutputPath>
31+
<OutputPath>..\..\Package\Release\ServiceManagement\Azure\Services</OutputPath>
3232
<DefineConstants>TRACE;SIGN</DefineConstants>
3333
<Optimize>true</Optimize>
3434
<DebugType>pdbonly</DebugType>
@@ -60,10 +60,6 @@
6060
<Reference Include="Microsoft.Azure.Common.NetFramework">
6161
<HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
66-
</Reference>
6763
<Reference Include="Microsoft.Build" />
6864
<Reference Include="Microsoft.Build.Framework" />
6965
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -161,7 +157,9 @@
161157
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
162158
</Content>
163159
<None Include="MSSharedLibKey.snk" />
164-
<None Include="packages.config" />
160+
<None Include="packages.config">
161+
<SubType>Designer</SubType>
162+
</None>
165163
</ItemGroup>
166164
<ItemGroup>
167165
<Content Include="Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml">

‎src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@
130130
</Reference>
131131
</ItemGroup>
132132
<ItemGroup>
133-
<Compile Include="..\Commands.Common.Test\Mocks\MockCommandRuntime.cs">
134-
<Link>Mocks\MockCommandRuntime.cs</Link>
135-
</Compile>
133+
<Compile Include="Mocks\MockCommandRuntime.cs" />
136134
<Compile Include="PSCmdletExtensions.cs" />
137135
<Compile Include="Constants.cs" />
138136
<Compile Include="EnvironmentSetupHelper.cs" />

‎src/Common/Commands.Common.Test/Mocks/MockCommandRuntime.cs renamed to ‎src/Common/Commands.ScenarioTests.Common/Mocks/MockCommandRuntime.cs

File renamed without changes.

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,18 +188,12 @@
188188
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionSettingsSerializer.cs">
189189
<Link>Extension\DSC\DscExtensionSettingsSerializer.cs</Link>
190190
</Compile>
191-
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Exceptions\GetDscResourceException.cs">
192-
<Link>Extension\DSC\GetDscResourceException.cs</Link>
193-
</Compile>
194191
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\ConfigurationParseResult.cs">
195192
<Link>Extension\DSC\ConfigurationParseResult.cs</Link>
196193
</Compile>
197194
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\ConfigurationParsingHelper.cs">
198195
<Link>Extension\DSC\ConfigurationParsingHelper.cs</Link>
199196
</Compile>
200-
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\DscExtensionPublishCmdletCommonBase.cs">
201-
<Link>Extension\DSC\DscExtensionPublishCmdletCommonBase.cs</Link>
202-
</Compile>
203197
<Compile Include="AvailabilitySets\RemoveAzureAvailabilitySetCommand.cs" />
204198
<Compile Include="AvailabilitySets\GetAzureAvailabilitySetCommand.cs" />
205199
<Compile Include="AvailabilitySets\NewAzureAvailabilitySetCommand.cs" />
@@ -219,6 +213,8 @@
219213
<Compile Include="Extension\Diagnostics\GetAzureVMDiagnosticsExtension.cs" />
220214
<Compile Include="Extension\Diagnostics\RemoveAzureVMDiagnosticsExtension.cs" />
221215
<Compile Include="Extension\Diagnostics\SetAzureVMDiagnosticsExtension.cs" />
216+
<Compile Include="Extension\DSC\GetDscResourceException.cs" />
217+
<Compile Include="Extension\DSC\DscExtensionPublishCmdletCommonBase.cs" />
222218
<Compile Include="Extension\DSC\DscExtensionCmdletCommonBase.cs" />
223219
<Compile Include="Extension\DSC\PublishAzureVMDscConfigurationCommand.cs" />
224220
<Compile Include="Extension\DSC\RemoveAzureVMDscExtensionCommand.cs" />

0 commit comments

Comments
 (0)