Skip to content
This repository was archived by the owner on Feb 23, 2024. It is now read-only.

Commit 0cb112f

Browse files
lucashuet93lucashuet93
committed
create solution file and include both projects
1 parent 5662e2f commit 0cb112f

28 files changed

+196
-145
lines changed

‎.gitattributes

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

‎src/APIM_ARMTemplate/APIM_ARMTemplate.sln

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.27004.2010
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "apimtemplate", "apimtemplate\apimtemplate.csproj", "{882899E4-B3FE-49BA-9B4E-61B3496B37DE}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "apimtemplate.test", "apimtemplate.test\apimtemplate.test.csproj", "{9B0EF41E-7730-4FA6-BD9A-A1024CF80E58}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{882899E4-B3FE-49BA-9B4E-61B3496B37DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{882899E4-B3FE-49BA-9B4E-61B3496B37DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{882899E4-B3FE-49BA-9B4E-61B3496B37DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{882899E4-B3FE-49BA-9B4E-61B3496B37DE}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{9B0EF41E-7730-4FA6-BD9A-A1024CF80E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{9B0EF41E-7730-4FA6-BD9A-A1024CF80E58}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{9B0EF41E-7730-4FA6-BD9A-A1024CF80E58}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{9B0EF41E-7730-4FA6-BD9A-A1024CF80E58}.Release|Any CPU.Build.0 = Release|Any CPU
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {C6DDDC25-6EF1-4B74-941E-6C3C34D9178F}
30+
EndGlobalSection
31+
EndGlobal

‎src/apimtemplate.test/CmdLine/CreateTests.cs renamed to ‎src/APIM_ARMTemplate/apimtemplate.test/CmdLine/CreateTests.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
using System;
2-
using Xunit;
3-
using McMaster.Extensions.CommandLineUtils;
4-
5-
namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
6-
{
7-
public class CreateTests
8-
{
9-
10-
[Fact]
11-
public void ShouldFailWithUnknownCommand()
12-
{
13-
14-
var createCommand = new CreateCommand();
15-
16-
var ex = Assert.ThrowsAny<CommandParsingException>(() => createCommand.Execute("test"));
17-
//Console.WriteLine(ex.Message);
18-
Assert.Contains("Unrecognized command or argument 'test'", ex.Message);
19-
}
20-
}
21-
}
1+
using System;
2+
using Xunit;
3+
using McMaster.Extensions.CommandLineUtils;
4+
5+
namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
6+
{
7+
public class CreateTests
8+
{
9+
10+
[Fact]
11+
public void ShouldFailWithUnknownCommand()
12+
{
13+
14+
var createCommand = new CreateCommand();
15+
16+
var ex = Assert.ThrowsAny<CommandParsingException>(() => createCommand.Execute("test"));
17+
//Console.WriteLine(ex.Message);
18+
Assert.Contains("Unrecognized command or argument 'test'", ex.Message);
19+
}
20+
}
21+
}

‎src/apimtemplate.test/CmdLine/ExtractTests.cs renamed to ‎src/APIM_ARMTemplate/apimtemplate.test/CmdLine/ExtractTests.cs

File renamed without changes.

‎src/apimtemplate.test/apimtemplate.test.csproj renamed to ‎src/APIM_ARMTemplate/apimtemplate.test/apimtemplate.test.csproj

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.1</TargetFramework>
5-
6-
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
8-
9-
<ItemGroup>
10-
<ProjectReference Include="..\..\src\apimtemplate\apimtemplate.csproj" />
11-
</ItemGroup>
12-
13-
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
15-
<PackageReference Include="xunit" Version="2.4.0" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
17-
</ItemGroup>
18-
19-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<ProjectReference Include="..\apimtemplate\apimtemplate.csproj" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
15+
<PackageReference Include="xunit" Version="2.4.0" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
17+
</ItemGroup>
18+
19+
</Project>

‎src/apimtemplate/Commands/Create.cs renamed to ‎src/APIM_ARMTemplate/apimtemplate/Commands/Create.cs

File renamed without changes.

‎src/apimtemplate/Commands/Extract.cs renamed to ‎src/APIM_ARMTemplate/apimtemplate/Commands/Extract.cs

File renamed without changes.

‎src/apimtemplate/Common/CLIArguments.cs renamed to ‎src/APIM_ARMTemplate/apimtemplate/Common/CLIArguments.cs

File renamed without changes.

‎src/apimtemplate/Common/Constants.cs renamed to ‎src/APIM_ARMTemplate/apimtemplate/Common/Constants.cs

File renamed without changes.

‎src/apimtemplate/Common/Templates/APITemplate.cs renamed to ‎src/APIM_ARMTemplate/apimtemplate/Common/Templates/APITemplate.cs

File renamed without changes.

0 commit comments

Comments
 (0)