Skip to content

Commit d710dee

Browse files
markcowlmarkcowl
committed
Moving DSC common classes into service management library, also skipping failing Sql Test
1 parent e69d502 commit d710dee

File tree

41 files changed

+89
-85
lines changed

Some content is hidden

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

41 files changed

+89
-85
lines changed

‎src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,4 @@
187187
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
188188
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
189189
</Target>
190-
</Project>
190+
</Project>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136
<Reference Include="System" />
137137
<Reference Include="System.Core" />
138138
<Reference Include="System.Data.Services.Client" />
139-
<Reference Include="System.IO.Compression.FileSystem" />
140139
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
141140
<Reference Include="System.Net" />
142141
<Reference Include="System.Net.Http" />
@@ -175,8 +174,6 @@
175174
<Compile Include="Common\GeneralTests.cs" />
176175
<Compile Include="Common\IdnUtilitiesTests.cs" />
177176
<Compile Include="Common\JsonUtilitiesTests.cs" />
178-
<Compile Include="Extensions\DSC\DscExtensionConfigurationParsingHelperTests.cs" />
179-
<Compile Include="Extensions\DSC\DscExtensionSettingsSerializerTests.cs" />
180177
<Compile Include="Mocks\ClientMocks.cs" />
181178
<Compile Include="Common\PSObjectExtensions.cs" />
182179
<Compile Include="Common\RemoveAzurePublishSettings.cs" />
@@ -314,4 +311,4 @@
314311
</PropertyGroup>
315312
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.0.0\build\net20\xunit.runner.visualstudio.props'))" />
316313
</Target>
317-
</Project>
314+
</Project>

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

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,6 @@
7070
<SpecificVersion>False</SpecificVersion>
7171
<HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.18.4-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7272
</Reference>
73-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
75-
</Reference>
76-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
78-
</Reference>
79-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
81-
</Reference>
8273
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
8374
<SpecificVersion>False</SpecificVersion>
8475
<HintPath>..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -103,9 +94,6 @@
10394
<SpecificVersion>False</SpecificVersion>
10495
<HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
10596
</Reference>
106-
<Reference Include="Microsoft.WindowsAzure.Storage">
107-
<HintPath>..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
108-
</Reference>
10997
<Reference Include="Newtonsoft.Json">
11098
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
11199
<Private>True</Private>
@@ -120,7 +108,6 @@
120108
</Reference>
121109
<Reference Include="System" />
122110
<Reference Include="System.Core" />
123-
<Reference Include="System.IO.Compression.FileSystem" />
124111
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
125112
<Reference Include="System.Net" />
126113
<Reference Include="System.Net.Http" />
@@ -142,9 +129,6 @@
142129
<Reference Include="System.ServiceModel" />
143130
<Reference Include="System.ServiceModel.Channels" />
144131
<Reference Include="System.ServiceModel.Web" />
145-
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
146-
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
147-
</Reference>
148132
<Reference Include="System.Web.Extensions" />
149133
<Reference Include="System.Windows.Forms" />
150134
<Reference Include="System.Xml.Linq" />
@@ -157,14 +141,6 @@
157141
<Compile Include="AzurePowerShell.cs" />
158142
<Compile Include="ComputeCloudException.cs" />
159143
<Compile Include="Constants.cs" />
160-
<Compile Include="Extensions\DSC\DscExtensionCmdletConstants.cs" />
161-
<Compile Include="Extensions\DSC\DscExtensionPrivateSettings.cs" />
162-
<Compile Include="Extensions\DSC\DscExtensionPublicSettings.cs" />
163-
<Compile Include="Extensions\DSC\DscExtensionSettingsSerializer.cs" />
164-
<Compile Include="Extensions\DSC\Exceptions\GetDscResourceException.cs" />
165-
<Compile Include="Extensions\DSC\Publish\ConfigurationParseResult.cs" />
166-
<Compile Include="Extensions\DSC\Publish\ConfigurationParsingHelper.cs" />
167-
<Compile Include="Extensions\DSC\Publish\DscExtensionPublishCmdletCommonBase.cs" />
168144
<Compile Include="Properties\Resources.Designer.cs">
169145
<AutoGen>True</AutoGen>
170146
<DesignTime>True</DesignTime>
@@ -219,4 +195,4 @@
219195
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
220196
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
221197
</Target>
222-
</Project>
198+
</Project>

‎src/Common/Commands.Common/packages.config

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,10 @@
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
12-
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
13-
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
14-
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
1512
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.18.206251556" targetFramework="net45" />
1613
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1714
<package id="Microsoft.Rest.ClientRuntime" version="1.2.0" targetFramework="net45" />
1815
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
1916
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2017
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
21-
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
22-
<package id="WindowsAzure.Storage" version="4.0.0" targetFramework="net45" />
2318
</packages>

‎src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,4 +244,4 @@
244244
<Target Name="AfterBuild">
245245
</Target>
246246
-->
247-
</Project>
247+
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,4 +479,4 @@
479479
<Target Name="AfterBuild">
480480
</Target>
481481
-->
482-
</Project>
482+
</Project>

‎src/ResourceManager/Batch/Commands.Batch/Commands.Batch.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,4 +314,4 @@
314314
<Target Name="AfterBuild">
315315
</Target>
316316
-->
317-
</Project>
317+
</Project>

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

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,30 @@
171171
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
172172
</ItemGroup>
173173
<ItemGroup>
174+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionCmdletConstants.cs">
175+
<Link>Extension\DSC\DscExtensionCmdletConstants.cs</Link>
176+
</Compile>
177+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionPrivateSettings.cs">
178+
<Link>Extension\DSC\DscExtensionPrivateSettings.cs</Link>
179+
</Compile>
180+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionPublicSettings.cs">
181+
<Link>Extension\DSC\DscExtensionPublicSettings.cs</Link>
182+
</Compile>
183+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\DscExtensionSettingsSerializer.cs">
184+
<Link>Extension\DSC\DscExtensionSettingsSerializer.cs</Link>
185+
</Compile>
186+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Exceptions\GetDscResourceException.cs">
187+
<Link>Extension\DSC\GetDscResourceException.cs</Link>
188+
</Compile>
189+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\ConfigurationParseResult.cs">
190+
<Link>Extension\DSC\ConfigurationParseResult.cs</Link>
191+
</Compile>
192+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\ConfigurationParsingHelper.cs">
193+
<Link>Extension\DSC\ConfigurationParsingHelper.cs</Link>
194+
</Compile>
195+
<Compile Include="..\..\..\ServiceManagement\Compute\Commands.ServiceManagement\IaaS\Extensions\DSC\Publish\DscExtensionPublishCmdletCommonBase.cs">
196+
<Link>Extension\DSC\DscExtensionPublishCmdletCommonBase.cs</Link>
197+
</Compile>
174198
<Compile Include="AvailabilitySets\RemoveAzureAvailabilitySetCommand.cs" />
175199
<Compile Include="AvailabilitySets\GetAzureAvailabilitySetCommand.cs" />
176200
<Compile Include="AvailabilitySets\NewAzureAvailabilitySetCommand.cs" />
@@ -345,4 +369,4 @@
345369
<Target Name="AfterBuild">
346370
</Target>
347371
-->
348-
</Project>
372+
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,4 +327,4 @@
327327
<Target Name="AfterBuild">
328328
</Target>
329329
-->
330-
</Project>
330+
</Project>

‎src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,4 +275,4 @@
275275
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
276276
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
277277
</Target>
278-
</Project>
278+
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,4 @@
273273
<Target Name="AfterBuild">
274274
</Target>
275275
-->
276-
</Project>
276+
</Project>

‎src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,4 +240,4 @@
240240
<Target Name="AfterBuild">
241241
</Target>
242242
-->
243-
</Project>
243+
</Project>

‎src/ResourceManager/Network/Commands.Network/Commands.Network.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,4 +433,4 @@
433433
<Target Name="AfterBuild">
434434
</Target>
435435
-->
436-
</Project>
436+
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,4 +335,4 @@
335335
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
336336
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
337337
</Target>
338-
</Project>
338+
</Project>

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,4 +224,4 @@
224224
<Error Condition="!Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
225225
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
226226
</Target>
227-
</Project>
227+
</Project>

‎src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager2.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@
154154
<PostBuildEvent>
155155
</PostBuildEvent>
156156
</PropertyGroup>
157-
</Project>
157+
</Project>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,4 +249,4 @@
249249
<Target Name="AfterBuild">
250250
</Target>
251251
-->
252-
</Project>
252+
</Project>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,4 +355,4 @@
355355
</PropertyGroup>
356356
<Exec Command="$(PowerShellExe) $(PSCodeGenScriptPath) $(PSCodeGenTargetFolder) $(MSBuildProjectDirectory) $(ClientLibraryNamesSpace) $(BaseCmdletFullName) $(BaseCmdletClientName)" />
357357
</Target>
358-
</Project>
358+
</Project>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
</Reference>
152152
<Reference Include="System.Data" />
153153
<Reference Include="System.Data.Services.Client" />
154+
<Reference Include="System.IO.Compression.FileSystem" />
154155
<Reference Include="System.Management" />
155156
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
156157
<Reference Include="System.Net" />
@@ -440,6 +441,8 @@
440441
<DesignTime>True</DesignTime>
441442
<DependentUpon>Resource.resx</DependentUpon>
442443
</Compile>
444+
<Compile Include="UnitTests\Cmdlets\IaaS\Extensions\DSC\DscExtensionConfigurationParsingHelperTests.cs" />
445+
<Compile Include="UnitTests\Cmdlets\IaaS\Extensions\DSC\DscExtensionSettingsSerializerTests.cs" />
443446
<Compile Include="UnitTests\Cmdlets\IaaS\Extensions\DSC\GetAzureVMDscExtensionStatusUnitTest.cs" />
444447
<Compile Include="UnitTests\Cmdlets\IaaS\Extensions\VirtualMachineExtensionImageFactoryTests.cs" />
445448
<Compile Include="FunctionalTests\VMTemplateTests.cs" />
@@ -683,4 +686,4 @@
683686
<Target Name="AfterBuild">
684687
</Target>
685688
-->
686-
</Project>
689+
</Project>

0 commit comments

Comments
 (0)