Skip to content

Commit ac3e7fc

Browse files
committed
Merge pull request #66 from AsrOneSdk/geethas-dev
should revert a change from this PR (depending on NuGet)
2 parents 819136c + 5d60698 commit ac3e7fc

14 files changed

+3569
-1921
lines changed

setup/azurecmdfiles.wxi

Lines changed: 1018 additions & 4 deletions
Large diffs are not rendered by default.

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,16 @@
8383
<SpecificVersion>False</SpecificVersion>
8484
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
8585
</Reference>
86-
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<SpecificVersion>False</SpecificVersion>
88-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.5.1-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
89-
</Reference>
9086
<Reference Include="Microsoft.WindowsAzure.Testing, Version=1.0.5417.13285, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9187
<SpecificVersion>False</SpecificVersion>
9288
<HintPath>..\..\..\packages\Hydra.SpecTestSupport.1.0.5417.13285-prerelease\lib\net45\Microsoft.WindowsAzure.Testing.dll</HintPath>
9389
</Reference>
9490
<Reference Include="Newtonsoft.Json">
9591
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
9692
</Reference>
93+
<Reference Include="SiteRecovery.Tests">
94+
<HintPath>..\Commands.RecoveryServices\lib\SiteRecovery.Tests.dll</HintPath>
95+
</Reference>
9796
<Reference Include="System" />
9897
<Reference Include="System.Core" />
9998
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<package id="Microsoft.Azure.Common.Authentication" version="1.0.8-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Extensions" version="0.14.0-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.RecoveryServices" version="0.5.1-preview" targetFramework="net45" />
98
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
109
<package id="Microsoft.Azure.Test.Framework" version="1.0.5513.27084-prerelease" targetFramework="net45" />
1110
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5513.27084-prerelease" targetFramework="net45" />

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@
8787
<SpecificVersion>False</SpecificVersion>
8888
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll</HintPath>
8989
</Reference>
90-
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91-
<SpecificVersion>False</SpecificVersion>
92-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.5.1-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
93-
</Reference>
9490
<Reference Include="Microsoft.WindowsAzure.Management.Storage, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9591
<SpecificVersion>False</SpecificVersion>
9692
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.5.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -103,6 +99,10 @@
10399
<SpecificVersion>False</SpecificVersion>
104100
<HintPath>lib\Security.Cryptography.dll</HintPath>
105101
</Reference>
102+
<Reference Include="SiteRecovery.Tests, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
103+
<SpecificVersion>False</SpecificVersion>
104+
<HintPath>lib\SiteRecovery.Tests.dll</HintPath>
105+
</Reference>
106106
<Reference Include="System" />
107107
<Reference Include="System.Core" />
108108
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -211,9 +211,13 @@
211211
</ProjectReference>
212212
</ItemGroup>
213213
<ItemGroup>
214+
<Content Include="lib\Microsoft.WindowsAzure.Management.RecoveryServices.Specification.dll">
215+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
216+
</Content>
214217
<Content Include="lib\Security.Cryptography.dll">
215218
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
216219
</Content>
220+
<Content Include="lib\SiteRecovery.Tests.dll" />
217221
<Content Include="Microsoft.Azure.Commands.RecoveryServices.dll-help.xml">
218222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
219223
</Content>

0 commit comments

Comments
 (0)