Changes for switching all wmi calls to V2 namespace. V1 namespace is deprecated so it is better to be on v2 namespace.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0035fcc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0035fcc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0035fcc Branch: refs/heads/hyperv Commit: d0035fcc232fb98d296e4ab66f3f5b31eb3a3277 Parents: 2de16b1 Author: Donal Lafferty <donal.laffe...@citrix.com> Authored: Wed Oct 30 10:23:40 2013 +0530 Committer: Devdeep Singh <devd...@gmail.com> Committed: Wed Oct 30 11:05:53 2013 +0530 ---------------------------------------------------------------------- .../HypervResource/HypervResource.csproj | 206 +- .../HypervResource/HypervResourceController.cs | 2965 +++++++++--------- .../HypervResource/IWmiCallsV2.cs | 72 +- .../ServerResource/HypervResource/WmiCalls.cs | 1419 --------- .../ServerResource/HypervResource/WmiCallsV2.cs | 1576 +++++++++- .../HypervResourceController1Test.cs | 641 ++-- .../HypervResourceControllerTest.cs | 2296 +++++++------- .../ServerResource.Tests.csproj | 260 +- .../ROOT.virtualization.Msvm_ComputerSystem.cs | 1298 -------- .../ROOT.virtualization.Msvm_ConcreteJob.cs | 1665 ---------- ....virtualization.Msvm_ExternalEthernetPort.cs | 1996 ------------ .../ROOT.virtualization.Msvm_IDEController.cs | 1610 ---------- ...irtualization.Msvm_ImageManagementService.cs | 1401 --------- ...OOT.virtualization.Msvm_MemorySettingData.cs | 1083 ------- ....virtualization.Msvm_ProcessorSettingData.cs | 1190 ------- ...zation.Msvm_ResourceAllocationSettingData.cs | 976 ------ ...OT.virtualization.Msvm_SummaryInformation.cs | 1184 ------- ...OOT.virtualization.Msvm_SwitchLANEndpoint.cs | 1342 -------- .../ROOT.virtualization.Msvm_SwitchPort.cs | 1708 ---------- ...virtualization.Msvm_SyntheticEthernetPort.cs | 1960 ------------ ...ion.Msvm_SyntheticEthernetPortSettingData.cs | 1010 ------ .../ROOT.virtualization.Msvm_VLANEndpoint.cs | 1390 -------- ...rtualization.Msvm_VLANEndpointSettingData.cs | 885 ------ .../ROOT.virtualization.Msvm_VirtualSwitch.cs | 1305 -------- ...ation.Msvm_VirtualSwitchManagementService.cs | 1379 -------- ...ation.Msvm_VirtualSystemGlobalSettingData.cs | 1513 --------- ...ation.Msvm_VirtualSystemManagementService.cs | 1731 ---------- ...VirtualSystemManagementServiceSettingData.cs | 731 ----- ...tualization.Msvm_VirtualSystemSettingData.cs | 1206 ------- .../ROOT.virtualization.Msvm_VmLANEndpoint.cs | 1342 -------- ...OOT.virtualization.v2.Msvm_ComputerSystem.cs | 13 +- ...v2.Msvm_EthernetPortAllocationSettingData.cs | 1147 +++++++ ...virtualization.v2.Msvm_EthernetSwitchPort.cs | 2102 +++++++++++++ ...v2.Msvm_EthernetSwitchPortVlanSettingData.cs | 1005 ++++++ ...rtualization.v2.Msvm_ExternalEthernetPort.cs | 2070 ++++++++++++ ...ualization.v2.Msvm_ImageManagementService.cs | 1508 +++++++++ ...rtualization.v2.Msvm_KvpExchangeComponent.cs | 5 +- .../ROOT.virtualization.v2.Msvm_LANEndpoint.cs | 1405 +++++++++ ....virtualization.v2.Msvm_MemorySettingData.cs | 1146 +++++++ ...rtualization.v2.Msvm_ProcessorSettingData.cs | 1117 +++++++ ...ion.v2.Msvm_ResourceAllocationSettingData.cs | 993 ++++++ ...tion.v2.Msvm_StorageAllocationSettingData.cs | 1197 +++++++ ...virtualization.v2.Msvm_SummaryInformation.cs | 1520 +++++++++ ....v2.Msvm_SyntheticEthernetPortSettingData.cs | 1066 +++++++ ...tualization.v2.Msvm_VirtualEthernetSwitch.cs | 1369 ++++++++ ...vm_VirtualEthernetSwitchManagementService.cs | 1498 +++++++++ ...zation.v2.Msvm_VirtualHardDiskSettingData.cs | 1034 ++++++ ...on.v2.Msvm_VirtualSystemManagementService.cs | 143 +- ...VirtualSystemManagementServiceSettingData.cs | 1583 +++++----- .../WmiWrappers/WmiWrappers.csproj | 368 ++- 50 files changed, 25977 insertions(+), 35652 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0035fcc/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj index ed22a7a..05a0f51 100644 --- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj +++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResource.csproj @@ -1,105 +1,103 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{C963DFFF-65BA-4E71-ADA5-526A4DA4E0B2}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>HypervResource</RootNamespace> - <AssemblyName>HypervResource</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> - <RestorePackages>true</RestorePackages> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoUnitTestsDebug|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\NoUnitTestsDebug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <DebugType>full</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoUnitTests|AnyCPU'"> - <OutputPath>bin\NoUnitTests\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <Optimize>true</Optimize> - <DebugType>pdbonly</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <ItemGroup> - <Reference Include="AWSSDK"> - <HintPath>..\packages\AWSSDK.1.5.23.0\lib\AWSSDK.dll</HintPath> - </Reference> - <Reference Include="Ionic.Zip"> - <HintPath>..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll</HintPath> - </Reference> - <Reference Include="log4net"> - <HintPath>..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath> - </Reference> - <Reference Include="Newtonsoft.Json"> - <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Management" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Web" /> - <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> - </ItemGroup> - <ItemGroup> - <Compile Include="CloudStackTypes.cs" /> - <Compile Include="IWmiCalls.cs" /> - <Compile Include="IWmiCallsV2.cs" /> - <Compile Include="WmiCallsV2.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="HypervResourceController.cs" /> - <Compile Include="Utils.cs" /> - <Compile Include="WmiCalls.cs" /> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\WmiWrappers\WmiWrappers.csproj"> - <Project>{db824727-bdc3-437c-a364-7a811d8a160f}</Project> - <Name>WmiWrappers</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{C963DFFF-65BA-4E71-ADA5-526A4DA4E0B2}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>HypervResource</RootNamespace> + <AssemblyName>HypervResource</AssemblyName> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> + <RestorePackages>true</RestorePackages> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoUnitTestsDebug|AnyCPU'"> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\NoUnitTestsDebug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NoUnitTests|AnyCPU'"> + <OutputPath>bin\NoUnitTests\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>AnyCPU</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <ItemGroup> + <Reference Include="AWSSDK"> + <HintPath>..\packages\AWSSDK.1.5.23.0\lib\AWSSDK.dll</HintPath> + </Reference> + <Reference Include="Ionic.Zip"> + <HintPath>..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll</HintPath> + </Reference> + <Reference Include="log4net"> + <HintPath>..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath> + </Reference> + <Reference Include="Newtonsoft.Json"> + <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Management" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Web" /> + <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="CloudStackTypes.cs" /> + <Compile Include="IWmiCallsV2.cs" /> + <Compile Include="WmiCallsV2.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="HypervResourceController.cs" /> + <Compile Include="Utils.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="packages.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\WmiWrappers\WmiWrappers.csproj"> + <Project>{db824727-bdc3-437c-a364-7a811d8a160f}</Project> + <Name>WmiWrappers</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> </Project> \ No newline at end of file
