Skip to content

Commit c3b4bf5

Browse files
author
Jianghao Lu
committed
Both Service Mgmt and Resource Mgmt compile
1 parent 38123af commit c3b4bf5

File tree

7 files changed

+642
-37
lines changed

7 files changed

+642
-37
lines changed

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/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,6 @@
197197
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\ConfigurationParsingHelper.cs">
198198
<Link>Extension\DSC\ConfigurationParsingHelper.cs</Link>
199199
</Compile>
200-
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\DscExtensionPublishCmdletCommonBase.cs">
201-
<Link>Extension\DSC\DscExtensionPublishCmdletCommonBase.cs</Link>
202-
</Compile>
203200
<Compile Include="AvailabilitySets\RemoveAzureAvailabilitySetCommand.cs" />
204201
<Compile Include="AvailabilitySets\GetAzureAvailabilitySetCommand.cs" />
205202
<Compile Include="AvailabilitySets\NewAzureAvailabilitySetCommand.cs" />
@@ -219,6 +216,7 @@
219216
<Compile Include="Extension\Diagnostics\GetAzureVMDiagnosticsExtension.cs" />
220217
<Compile Include="Extension\Diagnostics\RemoveAzureVMDiagnosticsExtension.cs" />
221218
<Compile Include="Extension\Diagnostics\SetAzureVMDiagnosticsExtension.cs" />
219+
<Compile Include="Extension\DSC\DscExtensionPublishCmdletCommonBase.cs" />
222220
<Compile Include="Extension\DSC\DscExtensionCmdletCommonBase.cs" />
223221
<Compile Include="Extension\DSC\PublishAzureVMDscConfigurationCommand.cs" />
224222
<Compile Include="Extension\DSC\RemoveAzureVMDscExtensionCommand.cs" />

0 commit comments

Comments
 (0)