Skip to content

Commit 1b3d6e8

Browse files
Simplify.
1 parent 8c1c25e commit 1b3d6e8

18 files changed

+16
-152
lines changed

experiments/Azure.Experiments/Azure.Experiments.sln

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,24 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.27004.2002
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "Shared\Shared.shproj", "{8853A7EB-6500-4DAC-967B-EDB62091DB15}"
7-
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Standard", "Standard\Standard.csproj", "{2D601033-56E7-4AC0-A6A9-DCE6132C6641}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet", "DotNet\DotNet.csproj", "{A2BF6184-CFAF-4395-896D-6062D5C08CA1}"
11-
EndProject
126
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Standard.Tests", "Standard.Tests\Standard.Tests.csproj", "{76A7A65A-99E9-44B3-A5C4-404905AABAF5}"
137
EndProject
148
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared.Tests", "Shared.Tests\Shared.Tests.shproj", "{4E5EA79D-BB89-42F1-A46D-3289F70FC26D}"
159
EndProject
1610
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNet.Tests", "DotNet.Tests\DotNet.Tests.csproj", "{CC3A34AA-D62B-4352-8A44-5E3380216905}"
1711
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Experiments", "Azure.Experiments\Azure.Experiments.csproj", "{1D707014-5D2B-4C4E-9D1A-3A449A234329}"
13+
EndProject
1814
Global
1915
GlobalSection(SharedMSBuildProjectFiles) = preSolution
2016
Shared.Tests\Shared.Tests.projitems*{4e5ea79d-bb89-42f1-a46d-3289f70fc26d}*SharedItemsImports = 13
21-
Shared\Azure.Experiments.Shared.projitems*{8853a7eb-6500-4dac-967b-edb62091db15}*SharedItemsImports = 13
22-
Shared\Azure.Experiments.Shared.projitems*{a2bf6184-cfaf-4395-896d-6062d5c08ca1}*SharedItemsImports = 4
2317
Shared.Tests\Shared.Tests.projitems*{cc3a34aa-d62b-4352-8a44-5e3380216905}*SharedItemsImports = 4
2418
EndGlobalSection
2519
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2620
Debug|Any CPU = Debug|Any CPU
2721
Release|Any CPU = Release|Any CPU
2822
EndGlobalSection
2923
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30-
{2D601033-56E7-4AC0-A6A9-DCE6132C6641}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{2D601033-56E7-4AC0-A6A9-DCE6132C6641}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{2D601033-56E7-4AC0-A6A9-DCE6132C6641}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{2D601033-56E7-4AC0-A6A9-DCE6132C6641}.Release|Any CPU.Build.0 = Release|Any CPU
34-
{A2BF6184-CFAF-4395-896D-6062D5C08CA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35-
{A2BF6184-CFAF-4395-896D-6062D5C08CA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
36-
{A2BF6184-CFAF-4395-896D-6062D5C08CA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{A2BF6184-CFAF-4395-896D-6062D5C08CA1}.Release|Any CPU.Build.0 = Release|Any CPU
3824
{76A7A65A-99E9-44B3-A5C4-404905AABAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3925
{76A7A65A-99E9-44B3-A5C4-404905AABAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
4026
{76A7A65A-99E9-44B3-A5C4-404905AABAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -43,6 +29,10 @@ Global
4329
{CC3A34AA-D62B-4352-8A44-5E3380216905}.Debug|Any CPU.Build.0 = Debug|Any CPU
4430
{CC3A34AA-D62B-4352-8A44-5E3380216905}.Release|Any CPU.ActiveCfg = Release|Any CPU
4531
{CC3A34AA-D62B-4352-8A44-5E3380216905}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{1D707014-5D2B-4C4E-9D1A-3A449A234329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{1D707014-5D2B-4C4E-9D1A-3A449A234329}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{1D707014-5D2B-4C4E-9D1A-3A449A234329}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{1D707014-5D2B-4C4E-9D1A-3A449A234329}.Release|Any CPU.Build.0 = Release|Any CPU
4636
EndGlobalSection
4737
GlobalSection(SolutionProperties) = preSolution
4838
HideSolutionNode = FALSE

experiments/Azure.Experiments/Standard/Standard.csproj renamed to experiments/Azure.Experiments/Azure.Experiments/Azure.Experiments.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard1.4</TargetFramework>
4+
<TargetFrameworks>netstandard1.4;net452</TargetFrameworks>
55
<AssemblyName>Azure.Experiments</AssemblyName>
66
<RootNamespace>Azure.Experiments</RootNamespace>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -12,6 +12,7 @@
1212
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="16.3.0" />
1313
<PackageReference Include="Microsoft.Azure.Management.Network" Version="15.0.0-preview" />
1414
<PackageReference Include="Microsoft.Azure.Management.ResourceManager" Version="1.6.0-preview" />
15+
<PackageReference Include="System.Net.Http" Version="4.3.0" />
1516
</ItemGroup>
1617

1718
<Import Project="..\Shared\Azure.Experiments.Shared.projitems" Label="Shared" />

experiments/Azure.Experiments/DotNet.Tests/DotNet.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@
7777
<ItemGroup>
7878
<Compile Include="Properties\AssemblyInfo.cs" />
7979
</ItemGroup>
80-
<ItemGroup>
81-
<ProjectReference Include="..\DotNet\DotNet.csproj">
82-
<Project>{a2bf6184-cfaf-4395-896d-6062d5c08ca1}</Project>
83-
<Name>DotNet</Name>
84-
</ProjectReference>
85-
</ItemGroup>
8680
<ItemGroup>
8781
<None Include="packages.config" />
8882
</ItemGroup>
@@ -92,6 +86,12 @@
9286
<ItemGroup>
9387
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
9488
</ItemGroup>
89+
<ItemGroup>
90+
<ProjectReference Include="..\Azure.Experiments\Azure.Experiments.csproj">
91+
<Project>{1d707014-5d2b-4c4e-9d1a-3a449a234329}</Project>
92+
<Name>Azure.Experiments</Name>
93+
</ProjectReference>
94+
</ItemGroup>
9595
<Import Project="..\Shared.Tests\Shared.Tests.projitems" Label="Shared" />
9696
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9797
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

experiments/Azure.Experiments/DotNet/DotNet.csproj

Lines changed: 0 additions & 70 deletions
This file was deleted.

experiments/Azure.Experiments/DotNet/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

experiments/Azure.Experiments/DotNet/packages.config

Lines changed: 0 additions & 9 deletions
This file was deleted.

experiments/Azure.Experiments/Shared/Azure.Experiments.Shared.projitems

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,4 @@
88
<PropertyGroup Label="Configuration">
99
<Import_RootNamespace>Azure.Experiments.Shared</Import_RootNamespace>
1010
</PropertyGroup>
11-
<ItemGroup>
12-
<Compile Include="$(MSBuildThisFileDirectory)AzureObject.cs" />
13-
<Compile Include="$(MSBuildThisFileDirectory)Context.cs" />
14-
<Compile Include="$(MSBuildThisFileDirectory)NetworkInterfaceObject.cs" />
15-
<Compile Include="$(MSBuildThisFileDirectory)NetworkSecurityGroup.cs" />
16-
<Compile Include="$(MSBuildThisFileDirectory)PublicIpAddressObject.cs" />
17-
<Compile Include="$(MSBuildThisFileDirectory)ResourceGroupObject.cs" />
18-
<Compile Include="$(MSBuildThisFileDirectory)ResourceObject.cs" />
19-
<Compile Include="$(MSBuildThisFileDirectory)SubnetObject.cs" />
20-
<Compile Include="$(MSBuildThisFileDirectory)VirtualNetworkObject.cs" />
21-
<Compile Include="$(MSBuildThisFileDirectory)VmObject.cs" />
22-
</ItemGroup>
2311
</Project>

experiments/Azure.Experiments/Standard.Tests/Standard.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFrameworks>netcoreapp1.1;net4.5.2</TargetFrameworks>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<ProjectReference Include="..\Standard\Standard.csproj" />
17+
<ProjectReference Include="..\Azure.Experiments\Azure.Experiments.csproj" />
1818
</ItemGroup>
1919

2020
<Import Project="..\Shared.Tests\Shared.Tests.projitems" Label="Shared" />

0 commit comments

Comments
 (0)