Skip to content

Commit 24518a4

Browse files
MiYanniMiYanni
authored
Merge pull request #7089 from MiYanni/rediscache-update
RedisCache: Updated Insights version and added to NetStandard
2 parents 0abcbcd + 42693c3 commit 24518a4

27 files changed

+9809
-13837
lines changed

‎Azure.PowerShell.Netcore.sln

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tools.Common.Netcore", "too
123123
EndProject
124124
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StaticAnalysis.Netcore", "tools\StaticAnalysis\StaticAnalysis.Netcore.csproj", "{493FA948-DA9C-47CD-8385-3C0261377D86}"
125125
EndProject
126+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.RedisCache.Netcore", "src\ResourceManager\RedisCache\Commands.RedisCache\Commands.RedisCache.Netcore.csproj", "{06B4370D-D375-482C-AD23-CFDAC0176147}"
127+
EndProject
126128
Global
127129
GlobalSection(SolutionConfigurationPlatforms) = preSolution
128130
Debug|Any CPU = Debug|Any CPU
@@ -853,6 +855,18 @@ Global
853855
{493FA948-DA9C-47CD-8385-3C0261377D86}.Release|x64.Build.0 = Release|Any CPU
854856
{493FA948-DA9C-47CD-8385-3C0261377D86}.Release|x86.ActiveCfg = Release|Any CPU
855857
{493FA948-DA9C-47CD-8385-3C0261377D86}.Release|x86.Build.0 = Release|Any CPU
858+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
859+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|Any CPU.Build.0 = Debug|Any CPU
860+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|x64.ActiveCfg = Debug|Any CPU
861+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|x64.Build.0 = Debug|Any CPU
862+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|x86.ActiveCfg = Debug|Any CPU
863+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Debug|x86.Build.0 = Debug|Any CPU
864+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|Any CPU.ActiveCfg = Release|Any CPU
865+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|Any CPU.Build.0 = Release|Any CPU
866+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|x64.ActiveCfg = Release|Any CPU
867+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|x64.Build.0 = Release|Any CPU
868+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|x86.ActiveCfg = Release|Any CPU
869+
{06B4370D-D375-482C-AD23-CFDAC0176147}.Release|x86.Build.0 = Release|Any CPU
856870
EndGlobalSection
857871
GlobalSection(SolutionProperties) = preSolution
858872
HideSolutionNode = FALSE

‎src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.Netcore.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,9 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Azure.Insights" Version="0.11.0-preview" />
27+
<PackageReference Include="Microsoft.Azure.Insights" Version="0.15.0-preview" />
2828
<PackageReference Include="Microsoft.Azure.Management.Redis" Version="4.4.0" />
2929
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="6.5.0-preview" />
30-
<PackageReference Include="Microsoft.WindowsAzure.Configuration" Version="3.2.0" />
31-
<PackageReference Include="Microsoft.WindowsAzure.Storage" Version="6.1.0" />
32-
<PackageReference Include="Moq" Version="4.2.1510.2205" />
3330
</ItemGroup>
3431

3532
<ItemGroup>

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

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
4141
</PropertyGroup>
4242
<ItemGroup>
43-
<Reference Include="Microsoft.Azure.Insights">
44-
<HintPath>..\..\..\packages\Microsoft.Azure.Insights.0.11.0-preview\lib\net45\Microsoft.Azure.Insights.dll</HintPath>
43+
<Reference Include="Microsoft.Azure.Insights, Version=0.15.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
44+
<HintPath>..\..\..\packages\Microsoft.Azure.Insights.0.15.0-preview\lib\net45\Microsoft.Azure.Insights.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="Microsoft.Azure.Management.Redis, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -52,25 +52,6 @@
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.6.5.0-preview\lib\net452\Microsoft.Azure.Management.Storage.dll</HintPath>
5353
<Private>True</Private>
5454
</Reference>
55-
<Reference Include="Microsoft.Data.Edm">
56-
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
59-
<Reference Include="Microsoft.Data.OData">
60-
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
61-
<Private>True</Private>
62-
</Reference>
63-
<Reference Include="Microsoft.Data.Services.Client">
64-
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
65-
<Private>True</Private>
66-
</Reference>
67-
<Reference Include="Microsoft.WindowsAzure.Storage">
68-
<HintPath>..\..\..\packages\WindowsAzure.Storage.6.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
69-
</Reference>
70-
<Reference Include="System.Spatial">
71-
<HintPath>..\..\..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
72-
<Private>True</Private>
73-
</Reference>
7455
</ItemGroup>
7556
<ItemGroup>
7657
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -102,9 +83,6 @@
10283
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestImportExportReboot.json">
10384
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
10485
</None>
105-
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestMaxMemoryPolicyErrorCheck.json">
106-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
107-
</None>
10886
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRedisCache.json">
10987
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
11088
</None>

‎src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public static RedisCacheController NewInstance
6262
private void SetupManagementClients(MockContext context)
6363
{
6464
RedisManagementClient = GetRedisManagementClient(context);
65-
InsightsManagementClient = GetInsightsManagementClient();
65+
InsightsManagementClient = GetInsightsManagementClient(context);
6666
ResourceManagementClient = GetResourceManagementClient();
6767
NewResourceManagementClient = GetResourceManagementClient(context);
6868
StorageClient = GetStorageManagementClient(context);
@@ -122,9 +122,9 @@ private RedisManagementClient GetRedisManagementClient(MockContext context)
122122
return context.GetServiceClient<RedisManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
123123
}
124124

125-
private InsightsManagementClient GetInsightsManagementClient()
125+
private InsightsManagementClient GetInsightsManagementClient(MockContext context)
126126
{
127-
return LegacyTest.TestBase.GetServiceClient<InsightsManagementClient>(this.csmTestFactory);
127+
return context.GetServiceClient<InsightsManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
128128
}
129129

130130
private ResourceManagementClient GetResourceManagementClient()

0 commit comments

Comments
 (0)