Skip to content

Commit af9849e

Browse files
MiYanniMiYanni
authored
Merge pull request #2 from markcowl/netcore-compute
[Do Not Merge Yet]: Netcore compute
2 parents ca29c2c + 7eff4ce commit af9849e

File tree

6 files changed

+201
-114
lines changed

6 files changed

+201
-114
lines changed

‎src/Azure.PowerShell.Netcore.Test.sln

Lines changed: 57 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2027
4+
VisualStudioVersion = 15.0.27004.2002
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Profile.Test.Netcore", "ResourceManager\Profile\Commands.Profile.Test\Commands.Profile.Test.Netcore.csproj", "{87246108-B555-4F5F-B916-A9C6FABB1971}"
77
EndProject
@@ -19,9 +19,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.ResourceManager.Netc
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.ResourceManager.Authentication.Netcore", "ResourceManager\Common\Commands.Common.Authentication.ResourceManager\Common.ResourceManager.Authentication.Netcore.csproj", "{BA98145F-89C3-4D6E-9C1B-27DCECD65C73}"
2121
EndProject
22-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Network.Test.Netcore", "ResourceManager\Network\Commands.Network.Test\Commands.Network.Test.Netcore.csproj", "{0F4219ED-4A8E-4E6A-88A0-352D804B912D}"
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Compute.Test.Netcore", "ResourceManager\Compute\Commands.Compute.Test\Commands.Compute.Test.Netcore.csproj", "{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}"
23+
EndProject
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Storage.Netcore", "Common\Commands.Common.Storage\Common.Storage.Netcore.csproj", "{3DC6A9D1-7B07-4C39-9A8D-933809169327}"
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Network.Netcore", "Common\Commands.Common.Network\Common.Network.Netcore.csproj", "{3F2F6272-780F-479E-9742-79F0DEEA308F}"
2327
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Storage.Netcore", "Common\Commands.Common.Storage\Common.Storage.Netcore.csproj", "{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}"
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Strategies.Netcore", "ResourceManager\Common\Commands.Common.Strategies\Common.Strategies.Netcore.csproj", "{C1F773EB-551B-4735-BC6E-800122B2D2FE}"
29+
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Network.Test.Netcore", "ResourceManager\Network\Commands.Network.Test\Commands.Network.Test.Netcore.csproj", "{0F4219ED-4A8E-4E6A-88A0-352D804B912D}"
2531
EndProject
2632
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Sql.Test.Netcore", "ResourceManager\Sql\Commands.Sql.Test\Commands.Sql.Test.Netcore.csproj", "{F6D1E454-E51D-4F1F-916A-A4A3DED5850A}"
2733
EndProject
@@ -159,6 +165,54 @@ Global
159165
{BA98145F-89C3-4D6E-9C1B-27DCECD65C73}.Release|x64.Build.0 = Release|Any CPU
160166
{BA98145F-89C3-4D6E-9C1B-27DCECD65C73}.Release|x86.ActiveCfg = Release|Any CPU
161167
{BA98145F-89C3-4D6E-9C1B-27DCECD65C73}.Release|x86.Build.0 = Release|Any CPU
168+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
169+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Debug|Any CPU.Build.0 = Debug|Any CPU
170+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Debug|x64.ActiveCfg = Debug|Any CPU
171+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Debug|x64.Build.0 = Debug|Any CPU
172+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Debug|x86.ActiveCfg = Debug|Any CPU
173+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Debug|x86.Build.0 = Debug|Any CPU
174+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Release|Any CPU.ActiveCfg = Release|Any CPU
175+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Release|Any CPU.Build.0 = Release|Any CPU
176+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Release|x64.ActiveCfg = Release|Any CPU
177+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Release|x64.Build.0 = Release|Any CPU
178+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Release|x86.ActiveCfg = Release|Any CPU
179+
{F8C2BF4B-DCB5-4C3F-921E-66A23323D34E}.Release|x86.Build.0 = Release|Any CPU
180+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
181+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Debug|Any CPU.Build.0 = Debug|Any CPU
182+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Debug|x64.ActiveCfg = Debug|Any CPU
183+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Debug|x64.Build.0 = Debug|Any CPU
184+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Debug|x86.ActiveCfg = Debug|Any CPU
185+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Debug|x86.Build.0 = Debug|Any CPU
186+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Release|Any CPU.ActiveCfg = Release|Any CPU
187+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Release|Any CPU.Build.0 = Release|Any CPU
188+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Release|x64.ActiveCfg = Release|Any CPU
189+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Release|x64.Build.0 = Release|Any CPU
190+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Release|x86.ActiveCfg = Release|Any CPU
191+
{3DC6A9D1-7B07-4C39-9A8D-933809169327}.Release|x86.Build.0 = Release|Any CPU
192+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
193+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Debug|Any CPU.Build.0 = Debug|Any CPU
194+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Debug|x64.ActiveCfg = Debug|Any CPU
195+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Debug|x64.Build.0 = Debug|Any CPU
196+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Debug|x86.ActiveCfg = Debug|Any CPU
197+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Debug|x86.Build.0 = Debug|Any CPU
198+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Release|Any CPU.ActiveCfg = Release|Any CPU
199+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Release|Any CPU.Build.0 = Release|Any CPU
200+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Release|x64.ActiveCfg = Release|Any CPU
201+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Release|x64.Build.0 = Release|Any CPU
202+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Release|x86.ActiveCfg = Release|Any CPU
203+
{3F2F6272-780F-479E-9742-79F0DEEA308F}.Release|x86.Build.0 = Release|Any CPU
204+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
205+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
206+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Debug|x64.ActiveCfg = Debug|Any CPU
207+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Debug|x64.Build.0 = Debug|Any CPU
208+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Debug|x86.ActiveCfg = Debug|Any CPU
209+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Debug|x86.Build.0 = Debug|Any CPU
210+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
211+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Release|Any CPU.Build.0 = Release|Any CPU
212+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Release|x64.ActiveCfg = Release|Any CPU
213+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Release|x64.Build.0 = Release|Any CPU
214+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Release|x86.ActiveCfg = Release|Any CPU
215+
{C1F773EB-551B-4735-BC6E-800122B2D2FE}.Release|x86.Build.0 = Release|Any CPU
162216
{0F4219ED-4A8E-4E6A-88A0-352D804B912D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
163217
{0F4219ED-4A8E-4E6A-88A0-352D804B912D}.Debug|Any CPU.Build.0 = Debug|Any CPU
164218
{0F4219ED-4A8E-4E6A-88A0-352D804B912D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -171,18 +225,6 @@ Global
171225
{0F4219ED-4A8E-4E6A-88A0-352D804B912D}.Release|x64.Build.0 = Release|Any CPU
172226
{0F4219ED-4A8E-4E6A-88A0-352D804B912D}.Release|x86.ActiveCfg = Release|Any CPU
173227
{0F4219ED-4A8E-4E6A-88A0-352D804B912D}.Release|x86.Build.0 = Release|Any CPU
174-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
175-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
176-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Debug|x64.ActiveCfg = Debug|Any CPU
177-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Debug|x64.Build.0 = Debug|Any CPU
178-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Debug|x86.ActiveCfg = Debug|Any CPU
179-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Debug|x86.Build.0 = Debug|Any CPU
180-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
181-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Release|Any CPU.Build.0 = Release|Any CPU
182-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Release|x64.ActiveCfg = Release|Any CPU
183-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Release|x64.Build.0 = Release|Any CPU
184-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Release|x86.ActiveCfg = Release|Any CPU
185-
{3BDE1B1A-AA9A-45B1-A897-CDB31B6800C8}.Release|x86.Build.0 = Release|Any CPU
186228
{F6D1E454-E51D-4F1F-916A-A4A3DED5850A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
187229
{F6D1E454-E51D-4F1F-916A-A4A3DED5850A}.Debug|Any CPU.Build.0 = Debug|Any CPU
188230
{F6D1E454-E51D-4F1F-916A-A4A3DED5850A}.Debug|x64.ActiveCfg = Debug|Any CPU

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/TestUtilities.cs

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System.Diagnostics;
16+
using System.Runtime.CompilerServices;
17+
18+
namespace Microsoft.Azure.Commands.ScenarioTest
19+
{
20+
public static class TestUtilities
21+
{
22+
/// <summary>
23+
/// Get the method name of the calling method
24+
/// </summary>
25+
/// <param name="index">How deep into the strack trace to look - here we want the caller's caller.</param>
26+
/// <returns>The name of the declaring method</returns>
27+
[MethodImpl(MethodImplOptions.NoInlining)]
28+
public static string GetCurrentMethodName(int index = 1)
29+
{
30+
StackTrace st = new StackTrace();
31+
StackFrame sf = st.GetFrame(index);
32+
33+
34+
return sf.GetMethod().Name;
35+
}
36+
37+
/// <summary>
38+
/// Get the typename of the callling class
39+
/// </summary>
40+
/// <param name="index">How deep into the strack trace to look - here we want the caller's caller.</param>
41+
/// <returns>The name of the declaring type</returns>
42+
[MethodImpl(MethodImplOptions.NoInlining)]
43+
public static string GetCallingClass(int index = 1)
44+
{
45+
StackTrace st = new StackTrace();
46+
StackFrame sf = st.GetFrame(index);
47+
48+
49+
return sf.GetMethod().ReflectedType.ToString();
50+
}
51+
}
52+
}

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

Lines changed: 69 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,29 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Assert.ps1" Link="ScenarioTests\Assert.ps1">
26+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
27+
</None>
28+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Resources.ps1" Link="AzureRM.Resources.ps1">
29+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
30+
</None>
31+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Storage.ps1" Link="AzureRM.Storage.ps1">
32+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
33+
</None>
34+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Common.ps1" Link="ScenarioTests\Common.ps1">
35+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
36+
</None>
37+
</ItemGroup>
38+
39+
<ItemGroup>
40+
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.0-alpha" />
41+
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.0-alpha" />
2542
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
2643
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="18.0.0" />
27-
<PackageReference Include="Microsoft.Azure.Management.Network" Version="17.0.0-preview" />
28-
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="4.1.0-preview" />
29-
<PackageReference Include="Moq" Version="4.2.1510.2205" />
44+
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1-alpha" />
45+
<PackageReference Include="Microsoft.Azure.Management.Network" Version="19.0.0-preview" />
46+
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="7.1.0-preview" />
47+
<PackageReference Include="Moq" Version="4.7.145" />
3048
</ItemGroup>
3149

3250
<ItemGroup>
@@ -36,7 +54,6 @@
3654
<ProjectReference Include="..\..\Common\Commands.Common.Strategies\Common.Strategies.Netcore.csproj" />
3755
<ProjectReference Include="..\..\Common\Commands.ResourceManager.Common\Common.ResourceManager.Netcore.csproj" />
3856
<ProjectReference Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Common.ResourceManager.ScenarioTests.Netcore.csproj" />
39-
<ProjectReference Include="..\..\..\Common\Commands.Common.Storage\Common.Storage.Netcore.csproj" />
4057
</ItemGroup>
4158

4259
<ItemGroup>
@@ -54,4 +71,52 @@
5471
</None>
5572
</ItemGroup>
5673

74+
<ItemGroup>
75+
<None Update="ConfigFiles\DiagnosticsExtensionConfig.xml">
76+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
77+
</None>
78+
<None Update="ConfigFiles\DiagnosticsExtensionConfigWithSasToken.json">
79+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
80+
</None>
81+
<None Update="ConfigFiles\DiagnosticsExtensionConfigWithSasToken.xml">
82+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
83+
</None>
84+
<None Update="ConfigFiles\DiagnosticsExtensionConfigWithStorageType.json">
85+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
86+
</None>
87+
<None Update="ConfigFiles\DiagnosticsExtensionConfigWithStorageType.xml">
88+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
89+
</None>
90+
<None Update="ConfigFiles\DiagnosticsExtensionConfigWithWrongName.json">
91+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
92+
</None>
93+
<None Update="ConfigFiles\DiagnosticsExtensionConfigWithWrongName.xml">
94+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
95+
</None>
96+
<None Update="ConfigFiles\DiagnosticsExtensionPrivateConfig.json">
97+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
98+
</None>
99+
<None Update="ConfigFiles\DiagnosticsExtensionPrivateConfigWithSasToken.json">
100+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
101+
</None>
102+
<None Update="ConfigFiles\DiagnosticsExtensionPrivateConfigWithWrongName.json">
103+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
104+
</None>
105+
<None Update="ConfigFiles\DiagnosticsExtensionPublicConfig.json">
106+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
107+
</None>
108+
<None Update="ConfigFiles\DiagnosticsExtensionPublicConfigWithStorageType.json">
109+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
110+
</None>
111+
<None Update="Templates\azuredeploy.json">
112+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
113+
</None>
114+
<None Update="Templates\client.rb">
115+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
116+
</None>
117+
<None Update="Templates\tstorgnztn-validator.pem">
118+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
119+
</None>
120+
</ItemGroup>
121+
57122
</Project>

0 commit comments

Comments
 (0)