Code architecture refactoring and fixing project structure (#612)

Co-authored-by: Dmitrii Korolev <dmkorolev@microsoft.com>

Author: DeagleGross

.azure-pipelines/common/build-and-test.yml

@@ -3,10 +3,10 @@ steps:
   displayName: 'Build Projects'
   inputs:
     command: 'build'
-    projects: 'src/APIM_ARMTemplate/**/*.csproj'
+    projects: 'src/**/*.*csproj'
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Tests'
   inputs:
     command: 'test'
-    projects: 'src/APIM_ARMTemplate/**test**/**.*csproj'
+    projects: 'tests/**/*.*csproj'

.gitignore

@@ -12,6 +12,27 @@ nupkg/
 !.vscode/launch.json
 !.vscode/extensions.json
 
+# Rider 
+## User specific
+**/.idea/**/workspace.xml
+**/.idea/**/tasks.xml
+**/.idea/shelf/*
+**/.idea/dictionaries
+**/.idea/httpRequests/
+
+## Sensitive or high-churn files
+**/.idea/**/dataSources/
+**/.idea/**/dataSources.ids
+**/.idea/**/dataSources.xml
+**/.idea/**/dataSources.local.xml
+**/.idea/**/sqlDataSources.xml
+**/.idea/**/dynamic.xml
+
+## Rider auto-generates .iml files, and contentModel.xml
+**/.idea/**/*.iml
+**/.idea/**/contentModel.xml
+**/.idea/**/modules.xml
+
 # User-specific files
 *.suo
 *.user

src/APIM_ARMTemplate/apimtemplate/apimtemplate.sln renamed to Microsoft.Azure.Management.ApiManagement.sln

@@ -1,11 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.136
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "apimtemplate", "apimtemplate.csproj", "{B5183465-2BC1-4206-9C9F-5AC9615AC941}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArmTemplates", "src\ArmTemplates\ArmTemplates.csproj", "{B5183465-2BC1-4206-9C9F-5AC9615AC941}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "apimtemplate.test", "..\apimtemplate.test\apimtemplate.test.csproj", "{7D0C17F8-C0F5-4678-A75F-EB1BE94E3A46}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ArmTemplates.Tests", "tests\ArmTemplates.Tests\ArmTemplates.Tests.csproj", "{7D0C17F8-C0F5-4678-A75F-EB1BE94E3A46}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A8FCD0FA-2908-4EE5-B9DE-C0F6E0661C8D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{583B0ECD-81D1-4091-B158-2651468CBB51}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,6 +29,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{B5183465-2BC1-4206-9C9F-5AC9615AC941} = {A8FCD0FA-2908-4EE5-B9DE-C0F6E0661C8D}
+		{7D0C17F8-C0F5-4678-A75F-EB1BE94E3A46} = {583B0ECD-81D1-4091-B158-2651468CBB51}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {86622F7B-B2EB-4FC7-9164-36F06B2F8B1D}
 	EndGlobalSection

README.md

@@ -6,7 +6,7 @@ APIs have become mundane. They have become the de facto standard for connecting
 
 With the strategic value of APIs, a continuous integration (CI) and continuous deployment (CD) pipeline has become an important aspect of API development. It allows organizations to automate deployment of API changes without error-prone manual steps, detect issues earlier, and ultimately deliver value to end users faster.
 
-This repository provides [guidance](./README.md), [examples](./example/), and [tools](./src/APIM_ARMTemplate/README.md) to help you achieve API DevOps with Azure API Management.
+This repository provides [guidance](./README.md), [examples](./example/), and [tools](./src/README.md) to help you achieve API DevOps with Azure API Management.
 
 ## The Problem
 
@@ -39,9 +39,9 @@ API developers will fork the publisher repository to a developer repository and
 
 We realize there are two challenges for API developers when working with Resource Manager templates:
 
-* First, API developers often work with [OpenAPI Specification](https://github.com/OAI/OpenAPI-Specification) and may not be familiar with Resource Manager schemas. Authoring templates manually might be an error-prone task. Therefore, we created a utility tool called [**Creator**](./src/APIM_ARMTemplate/README.md#Creator) to automate the creation of API templates based on an Open API Specification file. Optionally, developers can supply API Management policies for an API in XML format. Basically, the tool inserts the Open API specification and policies into a Resource Manager template in the proper format. With this tool, API developers can continue focusing on the formats and artifacts they are familiar with.
+* First, API developers often work with [OpenAPI Specification](https://github.com/OAI/OpenAPI-Specification) and may not be familiar with Resource Manager schemas. Authoring templates manually might be an error-prone task. Therefore, we created a utility tool called [**Creator**](./src/README.md#Creator) to automate the creation of API templates based on an Open API Specification file. Optionally, developers can supply API Management policies for an API in XML format. Basically, the tool inserts the Open API specification and policies into a Resource Manager template in the proper format. With this tool, API developers can continue focusing on the formats and artifacts they are familiar with.
 
-* Second, for customers who have already been using API Management, another challenge is how to extract existing configurations into Resource Manager templates. For those customers, We have created another tool called [**Extractor**](./src/APIM_ARMTemplate/README.md#extractor) to help them generate templates by extracting configurations from their exisitng API Management instances.  
+* Second, for customers who have already been using API Management, another challenge is how to extract existing configurations into Resource Manager templates. For those customers, We have created another tool called [**Extractor**](./src/README.md#extractor) to help them generate templates by extracting configurations from their exisitng API Management instances.  
 
 Once API developers have finished developing and testing an API, and have generated the API template, they can submit a pull request to merge the changes to the publisher repository. API publishers can validate the pull request and make sure the changes are safe and compliant. For example, they can check if only HTTPS is allowed to communicate with the API. Most of these validations can be automated as a step in the CI/CD pipeline. Once the changes are approved and merged successfully, API publishers can choose to deploy them to the Production instance either on schedule or on demand. The deployment of the templates can be automated using [Github Actions](https://github.com/Azure/apimanagement-devops-samples), [Azure Pipeline](https://docs.microsoft.com/en-us/azure/devops/pipelines/?view=azure-devops), [PowerShell](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-template-deploy), [Azure CLI](Azure-cli-example.md) or other tools. An example using Azure DevOps can be find [here](docs/AzDO-Example.md)
 

docs/AzDO-Example.md

@@ -76,7 +76,7 @@ Where:
 
 **RESOURCE-GROUP-NAME:** Resource group where the DEV-APIM-NAME is hosted.
 
-***For more information on how to run the application and parameters, [go to this page](https://github.com/Azure/azure-api-management-devops-resource-kit/blob/master/src/APIM_ARMTemplate/README.md#extractor).***
+***For more information on how to run the application and parameters, [go to this page](https://github.com/Azure/azure-api-management-devops-resource-kit/blob/master/src/README.md#extractor).***
 
 After executing the command above, you will see something similar to this:
 

example/demo/README.md

@@ -4,5 +4,5 @@ In order to run the creator on this example:
 
 ```bash
 mkdir Output
-dotnet run --project ../../src/APIM_ARMTemplate/apimtemplate create --configFile Input/valid.yml
+dotnet run --project ../../src/ARMTemplates create --configFile Input/valid.yml
 ```