Skip to content

Commit 3bd1fc6

Browse files
avirupchavirupch
committed
referring to latest storsimple .net nuget pkg
1 parent 70afa87 commit 3bd1fc6

File tree

6 files changed

+14
-41
lines changed

6 files changed

+14
-41
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -513,12 +513,6 @@
513513
<Component Id="cmpBF4C7868DB8CE8B4B50CAF51B647E2B1" Guid="*">
514514
<File Id="fil19BB25F9DA24781AACDA2274CE28507D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.ResourceManager.dll" />
515515
</Component>
516-
<Component Id="cmpF62DAC19C5372AC038D746C88EFEADFB" Guid="*">
517-
<File Id="filDABC128694F5874375CB4CB1753939B0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Test.Framework.dll" />
518-
</Component>
519-
<Component Id="cmp59E348355866C4C93CF1C80074476F24" Guid="*">
520-
<File Id="filAA23C90DC2E0C4AB00805D1844FDCF81" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Test.HttpRecorder.dll" />
521-
</Component>
522516
<Component Id="cmpA937677C4B398F4B7A4CF18B5A1E292D" Guid="*">
523517
<File Id="fil850F0FF63537F0428126B3E04D5A49E6" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.Data.Edm.dll" />
524518
</Component>
@@ -576,15 +570,15 @@
576570
<Component Id="cmpF750706356EAB58C8C81ED96B57288C8" Guid="*">
577571
<File Id="fil8D685FEB0876E6E1411E69E03A3CDB8F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Management.Storage.dll" />
578572
</Component>
573+
<Component Id="cmp32A0C53BFC04028B9D6A48690191D6B3" Guid="*">
574+
<File Id="fil8E5F14631FFC90E7DABCD8CED70B99DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Management.StorSimple.dll" />
575+
</Component>
579576
<Component Id="cmp607260D321DBB6DC85249332ACCCDF1E" Guid="*">
580577
<File Id="fil407E99E341C057EBEAA7597A7276562B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Microsoft.WindowsAzure.Storage.dll" />
581578
</Component>
582579
<Component Id="cmp81ACE07255D539B22EAAE5C07BF9C6B7" Guid="*">
583580
<File Id="fil20BBB718A749C1E485E5AAC0700CB59C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\Newtonsoft.Json.dll" />
584581
</Component>
585-
<Component Id="cmpE631AF96531CCAE5D68EC90A5F202819" Guid="*">
586-
<File Id="filE54271F9D1563CBA4916F0B949571B2C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\StorSimple.Tests.dll" />
587-
</Component>
588582
<Component Id="cmp5B024A4E29BF400F1ED3DE2CE1F2E0DD" Guid="*">
589583
<File Id="filBDA4AC7C21781E73732383C29552E770" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\System.Net.Http.Extensions.dll" />
590584
</Component>
@@ -597,9 +591,6 @@
597591
<Component Id="cmpCADE67F2ED98E9D37A3889AE074E65ED" Guid="*">
598592
<File Id="fil59FE45D1790EB33DE9F5C7E23E2F7100" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\System.Spatial.dll" />
599593
</Component>
600-
<Component Id="cmp0DBB1A9E8815FACE01E98D9FC176F761" Guid="*">
601-
<File Id="filDA6AD875BE41A54DFE251E643544CE27" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Resources\xunit.dll" />
602-
</Component>
603594
</Directory>
604595
<Directory Id="dir70AE8239A404E2C5D5621DBCDA6733C9" Name="Sql">
605596
<Component Id="cmp5746A3BAD258D8EA1473730146C01F1D" Guid="*">
@@ -2628,12 +2619,6 @@
26282619
<Component Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" Guid="*">
26292620
<File Id="filBD421847424CAE48F72C74C69770D8C0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.Common.NetFramework.dll" />
26302621
</Component>
2631-
<Component Id="cmp3A441B3B72BBDE324C9BE767A91B2B22" Guid="*">
2632-
<File Id="fil6EAE6F5F90187576171FD9854D69889F" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.Test.Framework.dll" />
2633-
</Component>
2634-
<Component Id="cmp1762C8B0F315879B27C69F85B4769909" Guid="*">
2635-
<File Id="filBF87CC17D5360E5C7047791E3CD7B294" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.Test.HttpRecorder.dll" />
2636-
</Component>
26372622
<Component Id="cmp9E03AAB684EA41B087D79346AE6C1073" Guid="*">
26382623
<File Id="fil501FE0FB963E03A9292BE5CC5A895CBB" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
26392624
</Component>
@@ -2664,12 +2649,12 @@
26642649
<Component Id="cmpBE0D655A7C1D36DC753F35A20389F05F" Guid="*">
26652650
<File Id="fil9F332E2D712A34BB01D4B387BE04650A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.WindowsAzure.Management.Scheduler.dll" />
26662651
</Component>
2652+
<Component Id="cmp6DAD84F1908D5F2A7C204E57242034FF" Guid="*">
2653+
<File Id="filF3F26CC3250E7ABE6E572E542BD54E4E" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.WindowsAzure.Management.StorSimple.dll" />
2654+
</Component>
26672655
<Component Id="cmpB7DDB72F9DBAE9F9F12C674FFD00853C" Guid="*">
26682656
<File Id="filD2BEA0DE1FB483F4C3E220994E31B7D5" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Newtonsoft.Json.dll" />
26692657
</Component>
2670-
<Component Id="cmp60CF1E1226A52DEBD4407C452F81EEC5" Guid="*">
2671-
<File Id="fil4AD411694BEB4E517894626665DFF384" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\StorSimple.Tests.dll" />
2672-
</Component>
26732658
<Component Id="cmp0631D52AB2CC9A302EABD7E074F5677D" Guid="*">
26742659
<File Id="filF5DF3AE44556843B9BA2FC427BD6E2CE" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\System.Net.Http.Extensions.dll" />
26752660
</Component>
@@ -2679,9 +2664,6 @@
26792664
<Component Id="cmp4E07D562E97B5A66522EB87589E3C876" Guid="*">
26802665
<File Id="fil93F578F2247467F06FF71FF3FDEFCE4A" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\System.Net.Http.Primitives.dll" />
26812666
</Component>
2682-
<Component Id="cmp67B3347773445FF39CF8B39D8DE0C22F" Guid="*">
2683-
<File Id="filF03B803C5170E74903669AB13AB3A449" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\xunit.dll" />
2684-
</Component>
26852667
</Directory>
26862668
<Directory Id="dirE7E1C4D3416099C7648453EA7E433216" Name="TrafficManager">
26872669
<Component Id="cmp7A04B677540DBCD0BD49BD5C26172FF4" Guid="*">
@@ -2929,8 +2911,6 @@
29292911
<ComponentRef Id="cmpE1BF6EAEEB822D9D73DBCFAB13791982" />
29302912
<ComponentRef Id="cmpB571FD86C3A85FE12327FC783A65BC2E" />
29312913
<ComponentRef Id="cmpBF4C7868DB8CE8B4B50CAF51B647E2B1" />
2932-
<ComponentRef Id="cmpF62DAC19C5372AC038D746C88EFEADFB" />
2933-
<ComponentRef Id="cmp59E348355866C4C93CF1C80074476F24" />
29342914
<ComponentRef Id="cmpA937677C4B398F4B7A4CF18B5A1E292D" />
29352915
<ComponentRef Id="cmp49A15EDF3D2E72E177EF373D2E9AB2DE" />
29362916
<ComponentRef Id="cmpABB2FE63524DC4243E6F2FCDF24C7D5D" />
@@ -2950,14 +2930,13 @@
29502930
<ComponentRef Id="cmpE231A51CC41F80C051BC0663E08339BC" />
29512931
<ComponentRef Id="cmp0308F0BCCC45D37858315B38CEC3127D" />
29522932
<ComponentRef Id="cmpF750706356EAB58C8C81ED96B57288C8" />
2933+
<ComponentRef Id="cmp32A0C53BFC04028B9D6A48690191D6B3" />
29532934
<ComponentRef Id="cmp607260D321DBB6DC85249332ACCCDF1E" />
29542935
<ComponentRef Id="cmp81ACE07255D539B22EAAE5C07BF9C6B7" />
2955-
<ComponentRef Id="cmpE631AF96531CCAE5D68EC90A5F202819" />
29562936
<ComponentRef Id="cmp5B024A4E29BF400F1ED3DE2CE1F2E0DD" />
29572937
<ComponentRef Id="cmp997A920A652163E94E56A412D2BEC28C" />
29582938
<ComponentRef Id="cmp353F25E254A7722E3CADF046790D3C4D" />
29592939
<ComponentRef Id="cmpCADE67F2ED98E9D37A3889AE074E65ED" />
2960-
<ComponentRef Id="cmp0DBB1A9E8815FACE01E98D9FC176F761" />
29612940
<ComponentRef Id="cmp5746A3BAD258D8EA1473730146C01F1D" />
29622941
<ComponentRef Id="cmp56F52674BB946225BB64533814DCF37F" />
29632942
<ComponentRef Id="cmp499092B04619C0EDE4686B78E1128605" />
@@ -3610,8 +3589,6 @@
36103589
<ComponentRef Id="cmp844CE71A108EFCC5B93A410D5205E6DB" />
36113590
<ComponentRef Id="cmp6A927AFF9D7CBE438F31603C59A5D1A6" />
36123591
<ComponentRef Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" />
3613-
<ComponentRef Id="cmp3A441B3B72BBDE324C9BE767A91B2B22" />
3614-
<ComponentRef Id="cmp1762C8B0F315879B27C69F85B4769909" />
36153592
<ComponentRef Id="cmp9E03AAB684EA41B087D79346AE6C1073" />
36163593
<ComponentRef Id="cmpEC794DBE4822765C546A06D80EAA3292" />
36173594
<ComponentRef Id="cmpB48F1BD4D2E8307615F7E22174FF4E6D" />
@@ -3622,12 +3599,11 @@
36223599
<ComponentRef Id="cmp96B7E859E6B1867E3949455DEEB4E6FE" />
36233600
<ComponentRef Id="cmpAD8A1A5D3992F815160303B36F74BD2B" />
36243601
<ComponentRef Id="cmpBE0D655A7C1D36DC753F35A20389F05F" />
3602+
<ComponentRef Id="cmp6DAD84F1908D5F2A7C204E57242034FF" />
36253603
<ComponentRef Id="cmpB7DDB72F9DBAE9F9F12C674FFD00853C" />
3626-
<ComponentRef Id="cmp60CF1E1226A52DEBD4407C452F81EEC5" />
36273604
<ComponentRef Id="cmp0631D52AB2CC9A302EABD7E074F5677D" />
36283605
<ComponentRef Id="cmpF717085B273764E99EDA68C7F0EE158E" />
36293606
<ComponentRef Id="cmp4E07D562E97B5A66522EB87589E3C876" />
3630-
<ComponentRef Id="cmp67B3347773445FF39CF8B39D8DE0C22F" />
36313607
<ComponentRef Id="cmp7A04B677540DBCD0BD49BD5C26172FF4" />
36323608
<ComponentRef Id="cmp2F3D9CC58C335CAB2C998183C40038B2" />
36333609
<ComponentRef Id="cmp0DBA9B291A7405C6A2536BF95D2BB5F2" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Scheduler.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Scheduler.dll</HintPath>
8484
</Reference>
8585
<Reference Include="Microsoft.WindowsAzure.Management.StorSimple">
86-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.StorSimple.0.9.0-preview\lib\net40\Microsoft.WindowsAzure.Management.StorSimple.dll</HintPath>
86+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.StorSimple.1.0.0-preview\lib\net40\Microsoft.WindowsAzure.Management.StorSimple.dll</HintPath>
8787
</Reference>
8888
<Reference Include="Newtonsoft.Json">
8989
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ public static T GetServiceClient<T>() where T : class
105105
ConfigurationManager.AppSettings["ResourceName"],
106106
ConfigurationManager.AppSettings["ResourceId"],
107107
ConfigurationManager.AppSettings["ResourceNamespace"],
108-
ConfigurationManager.AppSettings["CisStampId"],
109108
testEnvironment.Credentials as SubscriptionCloudCredentials,
110109
testEnvironment.BaseUri);
111110
}
@@ -117,7 +116,6 @@ public static T GetServiceClient<T>() where T : class
117116
ConfigurationManager.AppSettings["ResourceName"],
118117
ConfigurationManager.AppSettings["ResourceId"],
119118
ConfigurationManager.AppSettings["ResourceNamespace"],
120-
ConfigurationManager.AppSettings["CisStampId"],
121119
testEnvironment.Credentials as SubscriptionCloudCredentials);
122120
}
123121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1313
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
1414
<package id="Microsoft.WindowsAzure.Management.Scheduler" version="6.0.0" targetFramework="net45" />
15-
<package id="Microsoft.WindowsAzure.Management.StorSimple" version="0.9.0-preview" targetFramework="net45" />
15+
<package id="Microsoft.WindowsAzure.Management.StorSimple" version="1.0.0-preview" targetFramework="net45" />
1616
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1717
<package id="xunit" version="1.9.2" targetFramework="net45" />
1818
</packages>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,12 @@
8282
<Reference Include="Microsoft.WindowsAzure.Management.Scheduler">
8383
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Scheduler.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Scheduler.dll</HintPath>
8484
</Reference>
85+
<Reference Include="Microsoft.WindowsAzure.Management.StorSimple">
86+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.StorSimple.1.0.0-preview\lib\net40\Microsoft.WindowsAzure.Management.StorSimple.dll</HintPath>
87+
</Reference>
8588
<Reference Include="Newtonsoft.Json">
8689
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
8790
</Reference>
88-
<Reference Include="StorSimple.Tests, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
89-
<SpecificVersion>False</SpecificVersion>
90-
<HintPath>..\..\..\..\..\hydra-specs-pr\StorSimple\StorSimple.Tests\bin\Debug\StorSimple.Tests.dll</HintPath>
91-
</Reference>
9291
<Reference Include="System" />
9392
<Reference Include="System.Core" />
9493
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
1313
<package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
1414
<package id="Microsoft.WindowsAzure.Management.Scheduler" version="6.0.0" targetFramework="net45" />
15-
<package id="Microsoft.WindowsAzure.Management.StorSimple" version="0.9.0-preview" targetFramework="net45" />
15+
<package id="Microsoft.WindowsAzure.Management.StorSimple" version="1.0.0-preview" targetFramework="net45" />
1616
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1717
</packages>

0 commit comments

Comments
 (0)