Skip to content

Commit 0b2e80d

Browse files
AzureRTAzureRT
committed
Merge pull request #8 from huangpf/dev
Address CR
2 parents c695eb7 + 682cd97 commit 0b2e80d

File tree

24 files changed

+8
-126
lines changed

24 files changed

+8
-126
lines changed

‎AzurePowershell.Test.targets‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
<SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
2222
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
2323
<StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
24-
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload"</TestFilter>
2524
<KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
25+
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload"</TestFilter>
2626
<ScenarioTestFilter>All</ScenarioTestFilter>
2727
<OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
2828
<AzureRTAllTestFilter>"Functional|AzureRTScenario|Sequential|AzureRTUpload|Network"</AzureRTAllTestFilter>
29-
<AzureRTParAllFilter>"Functional|AzureRTScenario"</AzureRTParAllFilter>
30-
<AzureRTAllPreviewFilter>"Functional|AzureRTScenario|Preview"</AzureRTAllPreviewFilter>
31-
<AzureRTUploadSeqFilter>"AzureRTUpload|Sequential"</AzureRTUploadSeqFilter>
32-
<AzureRTSeqAllFilter>"AzureRTUpload|Sequential|Network"</AzureRTSeqAllFilter>
29+
<AzureRTParAllFilter>"Functional|AzureRTScenario"</AzureRTParAllFilter>
30+
<AzureRTAllPreviewFilter>"Functional|AzureRTScenario|Preview"</AzureRTAllPreviewFilter>
31+
<AzureRTUploadSeqFilter>"AzureRTUpload|Sequential"</AzureRTUploadSeqFilter>
32+
<AzureRTSeqAllFilter>"AzureRTUpload|Sequential|Network"</AzureRTSeqAllFilter>
3333
</PropertyGroup>
3434

3535
<Target Name="InvokeMSTest">
@@ -195,7 +195,7 @@
195195
Command="for /l %%x in (1, 1, $(RepeatTimes)) do MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug%%x.trx"
196196
ContinueOnError="false" />
197197
</Target>
198-
198+
199199
<Target Name="AzureRTMulti" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
200200
<Message Importance="high" Text="Running tests:" />
201201
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,12 @@
7070
</Reference>
7171
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7272
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
73-
<Private>True</Private>
7473
</Reference>
7574
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7675
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
77-
<Private>True</Private>
7876
</Reference>
7977
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8078
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
81-
<Private>True</Private>
8279
</Reference>
8380
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8481
<SpecificVersion>False</SpecificVersion>
@@ -135,7 +132,6 @@
135132
<Reference Include="System.Runtime.Serialization" />
136133
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137134
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
138-
<Private>True</Private>
139135
</Reference>
140136
<Reference Include="System.Xml.Linq" />
141137
<Reference Include="System.Data.DataSetExtensions" />

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,12 @@
7272
</Reference>
7373
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7474
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
75-
<Private>True</Private>
7675
</Reference>
7776
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7877
<HintPath>..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
79-
<Private>True</Private>
8078
</Reference>
8179
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8280
<HintPath>..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
83-
<Private>True</Private>
8481
</Reference>
8582
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8683
<SpecificVersion>False</SpecificVersion>
@@ -135,7 +132,6 @@
135132
<Reference Include="System.ServiceModel.Web" />
136133
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137134
<HintPath>..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
138-
<Private>True</Private>
139135
</Reference>
140136
<Reference Include="System.Web.Extensions" />
141137
<Reference Include="System.Windows.Forms" />

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,6 @@
6969
<SpecificVersion>False</SpecificVersion>
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
7171
</Reference>
72-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
73-
<Private>True</Private>
74-
</Reference>
75-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
76-
<Private>True</Private>
77-
</Reference>
78-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<Private>True</Private>
80-
</Reference>
8172
<Reference Include="Microsoft.DataFactories.Runtime">
8273
<HintPath>..\..\..\packages\Microsoft.DataFactories.Runtime.0.11.1-preview\lib\net45\Microsoft.DataFactories.Runtime.dll</HintPath>
8374
</Reference>
@@ -131,7 +122,6 @@
131122
</Reference>
132123
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
133124
<HintPath>..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
134-
<Private>True</Private>
135125
</Reference>
136126
<Reference Include="System.Xml.Linq" />
137127
<Reference Include="System.Data.DataSetExtensions" />

‎src/ResourceManager/DataFactories/Commands.DataFactories/packages.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
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.DataFactories.Runtime" version="0.11.1-preview" targetFramework="net45" />
1613
<package id="Microsoft.DataTransfer.Gateway.Encryption" version="1.2.1-preview" targetFramework="net45" />
1714
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.11.10918.1222" targetFramework="net45" />

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,12 @@
113113
</Reference>
114114
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115115
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
116-
<Private>True</Private>
117116
</Reference>
118117
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
119118
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
120-
<Private>True</Private>
121119
</Reference>
122120
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123121
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
124-
<Private>True</Private>
125122
</Reference>
126123
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
127124
<SpecificVersion>False</SpecificVersion>
@@ -174,7 +171,6 @@
174171
<Reference Include="System.Net.Http.WebRequest" />
175172
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
176173
<HintPath>..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
177-
<Private>True</Private>
178174
</Reference>
179175
<Reference Include="System.XML" />
180176
<Reference Include="System.Xml.Linq" />

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,6 @@
6565
<SpecificVersion>False</SpecificVersion>
6666
<HintPath>..\..\..\packages\Microsoft.Azure.Management.StreamAnalytics.0.14.0-preview\lib\net40\Microsoft.Azure.Management.StreamAnalytics.dll</HintPath>
6767
</Reference>
68-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
69-
<Private>True</Private>
70-
</Reference>
71-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
72-
<Private>True</Private>
73-
</Reference>
74-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<Private>True</Private>
76-
</Reference>
7768
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7869
<SpecificVersion>False</SpecificVersion>
7970
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -102,11 +93,6 @@
10293
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
10394
</Reference>
10495
<Reference Include="System.Net.Http.WebRequest" />
105-
106-
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
107-
<HintPath>..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
108-
<Private>True</Private>
109-
</Reference>
11096
<Reference Include="System.Xml.Linq" />
11197
<Reference Include="System.Data.DataSetExtensions" />
11298
<Reference Include="Microsoft.CSharp" />

‎src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
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.11.10918.1222" targetFramework="net45" />
1613
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1714
<package id="Microsoft.WindowsAzure.Management" version="4.0.0" targetFramework="net45" />

‎src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@
6565
<SpecificVersion>False</SpecificVersion>
6666
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.12.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
6767
</Reference>
68-
69-
70-
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<Private>True</Private>
72-
</Reference>
73-
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<Private>True</Private>
75-
</Reference>
76-
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<Private>True</Private>
78-
</Reference>
79-
8068
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8169
<SpecificVersion>False</SpecificVersion>
8270
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.11.10918.1222\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -119,10 +107,6 @@
119107
</Reference>
120108
<Reference Include="System.Net.Http.WebRequest" />
121109
<Reference Include="System.Runtime.Serialization" />
122-
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123-
<HintPath>..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
124-
<Private>True</Private>
125-
</Reference>
126110
<Reference Include="System.Xml.Linq" />
127111
<Reference Include="System.Data.DataSetExtensions" />
128112
<Reference Include="Microsoft.CSharp" />

‎src/ResourceManager/Tags/Commands.Tags/packages.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
99
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
11-
<package id="Microsoft.Data.Edm" version="5.6.0" targetFramework="net45" />
12-
<package id="Microsoft.Data.OData" version="5.6.0" targetFramework="net45" />
13-
<package id="Microsoft.Data.Services.Client" version="5.6.0" targetFramework="net45" />
1411
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.11.10918.1222" targetFramework="net45" />
1512
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1613
<package id="Microsoft.WindowsAzure.Management" version="4.0.0" targetFramework="net45" />

0 commit comments

Comments
 (0)