Skip to content

Commit 2d92900

Browse files
EmmaZhuEmmaZhu
committed
Revert some unnecessary changes.
1 parent ac641f7 commit 2d92900

File tree

12 files changed

+38
-23
lines changed

12 files changed

+38
-23
lines changed

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/App.config

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<appSettings>
4+
<add key="ResourceName" value="backuprn" />
5+
<add key="ResourceGroupName" value="backuprg" />
6+
<add key="ResourceId" value="7368183945769329045" />
7+
<add key="ClientSettingsProvider.ServiceUri" value="" />
8+
</appSettings>
9+
</configuration>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@
154154
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
155155
</ItemGroup>
156156
<ItemGroup>
157+
<None Include="App.config">
158+
<SubType>Designer</SubType>
159+
</None>
157160
<None Include="packages.config">
158161
<SubType>Designer</SubType>
159162
</None>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,12 @@
7373
<Private>True</Private>
7474
</Reference>
7575
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76-
<SpecificVersion>False</SpecificVersion>
7776
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
7877
</Reference>
7978
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
80-
<SpecificVersion>False</SpecificVersion>
8179
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
8280
</Reference>
8381
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<SpecificVersion>False</SpecificVersion>
8582
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
8683
</Reference>
8784
<Reference Include="Microsoft.Hadoop.Client, Version=1.5.11.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -118,6 +115,10 @@
118115
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
119116
</Reference>
120117
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
118+
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
119+
<SpecificVersion>False</SpecificVersion>
120+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
121+
</Reference>
121122
<Reference Include="Microsoft.WindowsAzure.Management">
122123
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
123124
</Reference>
@@ -165,7 +166,6 @@
165166
<Reference Include="System.Runtime.Serialization" />
166167
<Reference Include="System.ServiceModel" />
167168
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
168-
<SpecificVersion>False</SpecificVersion>
169169
<HintPath>..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
170170
</Reference>
171171
<Reference Include="System.Xml.Linq" />

‎src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
2020
<package id="Microsoft.Rest.ClientRuntime" version="1.3.0" targetFramework="net45" />
2121
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
22+
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
2223
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2324
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.11" targetFramework="net45" />
2425
<package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
2526
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2627
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
27-
<package id="WindowsAzure.Storage" version="3.0.3" targetFramework="net45" />
28+
<package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />
2829
<package id="xunit" version="1.9.2" targetFramework="net45" />
2930
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
3031
<package id="xunit.runner.visualstudio" version="2.1.0-beta4-build1109" targetFramework="net45" />

‎src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,17 @@
6767
<SpecificVersion>False</SpecificVersion>
6868
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
6969
</Reference>
70-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
73-
</Reference>
7470
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7571
<SpecificVersion>False</SpecificVersion>
7672
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7773
</Reference>
7874
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
8075
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
8176
</Reference>
8277
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
8478
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
8579
</Reference>
8680
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<SpecificVersion>False</SpecificVersion>
8881
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
8982
</Reference>
9083
<Reference Include="Microsoft.Hadoop.Client, Version=1.5.11.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -120,6 +113,10 @@
120113
<Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop">
121114
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
122115
</Reference>
116+
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
117+
<SpecificVersion>False</SpecificVersion>
118+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
119+
</Reference>
123120
<Reference Include="Microsoft.WindowsAzure.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
124121
<SpecificVersion>False</SpecificVersion>
125122
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
@@ -164,7 +161,6 @@
164161
</Reference>
165162
<Reference Include="System.Net.Http.WebRequest" />
166163
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
167-
<SpecificVersion>False</SpecificVersion>
168164
<HintPath>..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
169165
</Reference>
170166
<Reference Include="System.Xml.Linq" />

‎src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Authentication" version="1.4.0-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
8-
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
98
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
109
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1110
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
@@ -18,9 +17,10 @@
1817
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1918
<package id="Microsoft.Rest.ClientRuntime" version="1.3.0" targetFramework="net45" />
2019
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="0.9.3" targetFramework="net45" />
20+
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="1.8.0.0" targetFramework="net45" />
2121
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2222
<package id="Microsoft.WindowsAzure.Management.HDInsight" version="1.5.11" targetFramework="net45" />
2323
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2424
<package id="System.Spatial" version="5.6.0" targetFramework="net45" />
25-
<package id="WindowsAzure.Storage" version="3.0.3" targetFramework="net45" />
25+
<package id="WindowsAzure.Storage" version="3.0.3.0" targetFramework="net45" />
2626
</packages>

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@
6969
<SpecificVersion>False</SpecificVersion>
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
7171
</Reference>
72-
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73-
<SpecificVersion>False</SpecificVersion>
74-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
75-
</Reference>
7672
<Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7773
<SpecificVersion>False</SpecificVersion>
7874
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.4.0-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
87
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
98
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
109
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@
151151
</ProjectReference>
152152
</ItemGroup>
153153
<ItemGroup>
154+
<None Include="App.config" />
154155
<None Include="packages.config">
155156
<SubType>Designer</SubType>
156157
</None>

‎src/ServiceManagement/StorSimple/Commands.StorSimple.Test/ScenarioTests/BackupPolicyTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ namespace Microsoft.WindowsAzure.Commands.StorSimple.Test.ScenarioTests
2020
public class BackupPolicyTests:StorSimpleTestBase
2121
{
2222
#region New-AzureStorSimpleDeviceBackupScheduleAddConfig
23-
[Fact(Skip = "TODO: Failed in constructor, owner should look at it")]
23+
[Fact]
2424
[Trait(Category.AcceptanceType, Category.CheckIn)]
2525
public void TestNewBackupPolicyConfig()
2626
{
2727
RunPowerShellTest("Test-NewBackupPolicyAddConfig");
2828
}
2929

30-
[Fact(Skip = "TODO: Failed in constructor, owner should look at it")]
30+
[Fact]
3131
[Trait(Category.AcceptanceType, Category.CheckIn)]
3232
public void TestNewBackupPolicyAddConfigDefaultValues()
3333
{

‎src/ServiceManagement/StorSimple/Commands.StorSimple.Test/app.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<appSettings>
4+
<add key="CloudServiceName" value="CisService-DTYHC5NYB4BUTV3ZHFNSE5EKIZZGLGYR44OJUL5OQGG4I2EMYOZA-west-us" />
5+
<add key="ResourceName" value="OneSDK-Resource" />
6+
<add key="ResourceId" value="1975530557201809476" />
7+
<add key="ResourceNamespace" value="WACis" />
8+
<add key="CisStampId" value="7ef900f6-ad91-497d-a9c5-2742b7ed4a75" />
9+
<add key="ClientSettingsProvider.ServiceUri" value="" />
10+
</appSettings>
11+
</configuration>

‎tools/PublishModules.ps1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ if ($repo -ne $null) {
5555

5656
$resourceManagerRootFolder = "$packageFolder\$buildConfig\ResourceManager\AzureResourceManager"
5757
$publishToLocal = test-path $repositoryLocation
58-
5958
if (($scope -eq 'All') -or $publishToLocal ) {
6059
# If we publish 'All' or to local folder, publish AzureRM.Profile first, becasue it is the common dependency
6160
Write-Host "Publishing profile module"

0 commit comments

Comments
 (0)