diff --git a/AutoRest.sln b/AutoRest.sln
index b11b89d798ca..e9e2ddf31232 100644
--- a/AutoRest.sln
+++ b/AutoRest.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Core", "AutoRest\AutoRest.Core\AutoRest.Core.csproj", "{C876085F-9DC3-41F0-B7B4-17022CD84684}"
 EndProject
@@ -372,6 +372,14 @@ Global
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
 		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
 		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/AutoRest/AutoRest.Core/AutoRest.nuspec b/AutoRest/AutoRest.Core/AutoRest.nuspec
index 0451285cb520..2af544a88582 100644
--- a/AutoRest/AutoRest.Core/AutoRest.nuspec
+++ b/AutoRest/AutoRest.Core/AutoRest.nuspec
@@ -31,6 +31,7 @@
     <file src="binaries/net45/AutoRest.Generator.Azure.Ruby.dll" target="tools" />
     <file src="binaries/net45/AutoRest.Generator.Python.dll" target="tools" />
     <file src="binaries/net45/AutoRest.Generator.Azure.Python.dll" target="tools" />
+    <file src="binaries/net45/AutoRest.Generator.AzureResourceSchema.dll" target="tools" />
     <file src="binaries/net45/AutoRest.Modeler.Swagger.dll" target="tools" />
     <file src="binaries/net45/AutoRest.Modeler.CompositeSwagger.dll" target="tools" />
     <file src="binaries/net45/Newtonsoft.Json.dll" target="tools" />
diff --git a/AutoRest/AutoRest/AutoRest.Release.json b/AutoRest/AutoRest/AutoRest.Release.json
index b488b12ca1fc..f368702db7a6 100644
--- a/AutoRest/AutoRest/AutoRest.Release.json
+++ b/AutoRest/AutoRest/AutoRest.Release.json
@@ -29,6 +29,9 @@
     },
     "Azure.Python": {
       "type": "AzurePythonCodeGenerator, AutoRest.Generator.Azure.Python"
+    },
+    "AzureResourceSchema": {
+      "type": "AzureResourceSchemaCodeGenerator, AutoRest.Generator.AzureResourceSchema"
     }
   },
   "modelers": {
diff --git a/AutoRest/AutoRest/AutoRest.json b/AutoRest/AutoRest/AutoRest.json
index b488b12ca1fc..f368702db7a6 100644
--- a/AutoRest/AutoRest/AutoRest.json
+++ b/AutoRest/AutoRest/AutoRest.json
@@ -29,6 +29,9 @@
     },
     "Azure.Python": {
       "type": "AzurePythonCodeGenerator, AutoRest.Generator.Azure.Python"
+    },
+    "AzureResourceSchema": {
+      "type": "AzureResourceSchemaCodeGenerator, AutoRest.Generator.AzureResourceSchema"
     }
   },
   "modelers": {
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj
index 01522ea89f2b..be1ade26d44d 100644
--- a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,6 +9,7 @@
     <ProjectGuid>{1C3B4A33-E045-4C8F-9202-1B651A686567}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Microsoft.Rest.Generator.AzureResourceSchema.Tests</RootNamespace>
     <RootNamespace>AutoRest.Generator.AzureResourceSchema.Tests</RootNamespace>
     <AssemblyName>AutoRest.Generator.AzureResourceSchema.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
@@ -33,6 +35,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -42,25 +48,32 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
+      <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
+      <HintPath>..\..\..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+      <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+      <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AzureResourceSchemaCodeGeneratorTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\AutoRest.Core\AutoRest.Core.csproj">
+      <Project>{c876085f-9dc3-41f0-b7b4-17022cd84684}</Project>
+      <Name>AutoRest.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -72,12 +85,16 @@
       <Name>AutoRest.Generator.AzureResourceSchema</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AzureResourceSchemaCodeGeneratorTests.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AzureResourceSchemaCodeGeneratorTests.cs
new file mode 100644
index 000000000000..c5c37c0a235f
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AzureResourceSchemaCodeGeneratorTests.cs
@@ -0,0 +1,155 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.ClientModel;
+using Microsoft.Rest.Generator.Utilities;
+using Newtonsoft.Json.Linq;
+using System.Linq;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema.Tests
+{
+    [Collection("AutoRest Tests")]
+    public class AzureResourceSchemaCodeGeneratorTests
+    {
+        [Fact]
+        public void Description()
+        {
+            Assert.Equal("Azure Resource Schema generator", CreateGenerator().Description);
+        }
+
+        [Fact]
+        public void ImplementationFileExtension()
+        {
+            Assert.Equal(".json", CreateGenerator().ImplementationFileExtension);
+        }
+
+        [Fact]
+        public void Name()
+        {
+            Assert.Equal("AzureResourceSchema", CreateGenerator().Name);
+        }
+
+        [Fact]
+        public void UsageInstructionsWithNoOutputFileSetting()
+        {
+            AzureResourceSchemaCodeGenerator codeGen = CreateGenerator();
+            Assert.Equal("Your Azure Resource Schema can be found at " + codeGen.SchemaPath, codeGen.UsageInstructions);
+        }
+
+        [Fact]
+        public void UsageInstructionsWithOutputFileSetting()
+        {
+            Settings settings = new Settings()
+            {
+                OutputFileName = "spam.json"
+            };
+            AzureResourceSchemaCodeGenerator codeGen = CreateGenerator(settings);
+
+            Assert.Equal("Your Azure Resource Schema can be found at " + codeGen.SchemaPath, codeGen.UsageInstructions);
+        }
+
+        [Fact]
+        public async void GenerateWithEmptyServiceClient()
+        {
+            await TestGenerate(new string[0],
+            @"{
+                'id': 'http://schema.management.azure.com/schemas//Microsoft.Storage.json#',
+                '$schema': 'http://json-schema.org/draft-04/schema#',
+                'title': 'Microsoft.Storage',
+                'description': 'Microsoft Storage Resource Types',
+                'resourceDefinitions': { }
+            }");
+        }
+
+        [Fact]
+        public async void GenerateWithServiceClientWithOneType()
+        {
+            await TestGenerate(new string[]
+            {
+                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Mock.Provider/mockType"
+            },
+            @"{
+                'id': 'http://schema.management.azure.com/schemas//Microsoft.Storage.json#',
+                '$schema': 'http://json-schema.org/draft-04/schema#',
+                'title': 'Microsoft.Storage',
+                'description': 'Microsoft Storage Resource Types',
+                'resourceDefinitions': {
+                    'mockType': {
+                    }
+                }
+            }");
+        }
+
+        [Fact]
+        public async void GenerateWithServiceClientWithTwoTypes()
+        {
+            await TestGenerate(new string[]
+            {
+                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Mock.Provider/mockType1",
+                "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Mock.Provider/mockType2"
+            },
+            @"{
+                'id': 'http://schema.management.azure.com/schemas//Microsoft.Storage.json#',
+                '$schema': 'http://json-schema.org/draft-04/schema#',
+                'title': 'Microsoft.Storage',
+                'description': 'Microsoft Storage Resource Types',
+                'resourceDefinitions': {
+                    'mockType1': {
+                    },
+                    'mockType2': {
+                    }
+                }
+            }");
+        }
+
+        [Fact]
+        public void NormalizeClientModelDoesNothing()
+        {
+            ServiceClient serviceClient = new ServiceClient();
+            CreateGenerator().NormalizeClientModel(serviceClient);
+
+            // Nothing happens
+        }
+
+        private static AzureResourceSchemaCodeGenerator CreateGenerator()
+        {
+            return CreateGenerator(new Settings());
+        }
+        private static AzureResourceSchemaCodeGenerator CreateGenerator(Settings settings)
+        {
+            return new AzureResourceSchemaCodeGenerator(settings);
+        }
+
+        private static async Task TestGenerate(string[] methodUrls, string expectedJsonString)
+        {
+            MemoryFileSystem fileSystem = new MemoryFileSystem();
+
+            Settings settings = new Settings();
+            settings.FileSystem = fileSystem;
+
+            ServiceClient serviceClient = new ServiceClient();
+            foreach(string methodUrl in methodUrls)
+            {
+                serviceClient.Methods.Add(new Method()
+                {
+                    Url = methodUrl
+                });
+            }
+            await CreateGenerator(settings).Generate(serviceClient);
+
+            Assert.Equal(2, fileSystem.VirtualStore.Count);
+
+            string folderPath = fileSystem.VirtualStore.Keys.First();
+            Assert.Equal("Folder", fileSystem.VirtualStore[folderPath].ToString());
+
+            JObject expectedJSON = JObject.Parse(expectedJsonString);
+
+            string fileContents = fileSystem.VirtualStore[fileSystem.VirtualStore.Keys.Skip(1).First()].ToString();
+            JObject actualJson = JObject.Parse(fileContents);
+
+            Assert.Equal(expectedJSON, actualJson);
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/packages.config b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/packages.config
index 4e690e09d9de..a9c24d52f8b6 100644
--- a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/packages.config
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />
   <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AutoRest.Generator.AzureResourceSchema.csproj b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AutoRest.Generator.AzureResourceSchema.csproj
index 9afbe46b7ef4..985dda8db10b 100644
--- a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AutoRest.Generator.AzureResourceSchema.csproj
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AutoRest.Generator.AzureResourceSchema.csproj
@@ -1,17 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <LibraryFxTarget Condition="'$(LibraryFxTarget)' == ''">net45</LibraryFxTarget>
     <ProjectGuid>{654344A5-0556-49C7-BFB3-59676D7440D3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Rest.Generator.AzureResourceSchema</RootNamespace>
     <AssemblyName>AutoRest.Generator.AzureResourceSchema</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <Configuration Condition=" '$(Configuration)' == '' ">Net45-Debug</Configuration>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)\Tools\AutoRest.Settings.targets" />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Net45-Debug|AnyCPU' ">
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Net45-Debug</OutputPath>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ResourceProperty.cs" />
+    <Compile Include="ResourceSchema.cs" />
+    <Compile Include="AzureResourceSchemaCodeGenerator.cs" />
+    <Compile Include="$(SolutionDir)\Tools\AssemblyVersionInfo.cs">
+      <Link>Properties\AssemblyVersionInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\AutoRest.Core\AutoRest.Core.csproj">
+      <Project>{c876085f-9dc3-41f0-b7b4-17022cd84684}</Project>
+      <Name>AutoRest.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Extensions\Extensions\AutoRest.Generator.Extensions.csproj">
+      <Project>{7dd043eb-5e53-4180-b123-cc3cc5022e34}</Project>
+      <Name>AutoRest.Generator.Extensions</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <CodeAnalysisDictionary Include="$(SolutionDir)\Tools\CustomDictionary.xml">
+      <Link>CustomDictionary.xml</Link>
+    </CodeAnalysisDictionary>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
@@ -40,6 +83,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Resource.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AzureResourceSchemaCodeGenerator.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AzureResourceSchemaCodeGenerator.cs
new file mode 100644
index 000000000000..04553f6ea2c0
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/AzureResourceSchemaCodeGenerator.cs
@@ -0,0 +1,218 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.ClientModel;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema
+{
+    public class AzureResourceSchemaCodeGenerator : CodeGenerator
+    {
+        public AzureResourceSchemaCodeGenerator(Settings settings)
+            : base(settings)
+        {
+        }
+
+        public string SchemaPath
+        {
+            get
+            {
+                string defaultSchemaFileName = Path.GetFileNameWithoutExtension(Settings.Input) + ".schema.json";
+                return Path.Combine(Settings.OutputDirectory, Settings.OutputFileName ?? defaultSchemaFileName);
+            }
+        }
+
+        public override string Description
+        {
+            get { return "Azure Resource Schema generator"; }
+        }
+
+        public override string ImplementationFileExtension
+        {
+            get { return ".json"; }
+        }
+
+        public override string Name
+        {
+            get { return "AzureResourceSchema"; }
+        }
+
+        public override string UsageInstructions
+        {
+            get { return "Your Azure Resource Schema can be found at " + SchemaPath; }
+        }
+
+        public override void NormalizeClientModel(ServiceClient serviceClient)
+        {
+        }
+
+        public override async Task Generate(ServiceClient serviceClient)
+        {
+            try
+            {
+                StringWriter stringWriter = new StringWriter();
+                using (JsonTextWriter writer = new JsonTextWriter(stringWriter))
+                {
+                    writer.Formatting = Formatting.Indented;
+                    writer.Indentation = 2;
+                    writer.IndentChar = ' ';
+
+                    ResourceSchema schema = ResourceSchema.Parse(serviceClient);
+
+                    WriteSchema(writer, schema);
+                }
+
+                await Write(stringWriter.ToString(), SchemaPath);
+            }
+            catch (Exception)
+            {
+                Debugger.Break();
+            }
+        }
+
+        private static void WriteSchema(JsonTextWriter writer, ResourceSchema schema)
+        {
+            WriteObject(writer, () =>
+            {
+                WriteProperty(writer, "id", schema.Id);
+                WriteProperty(writer, "$schema", "http://json-schema.org/draft-04/schema#");
+                WriteProperty(writer, "title", schema.Title);
+                WriteProperty(writer, "description", schema.Description);
+                WriteProperty(writer, "resourceDefinitions", () =>
+                {
+                    foreach (Resource resource in schema.Resources)
+                    {
+                        WriteResource(writer, resource);
+                    }
+                });
+            });
+        }
+
+        private static void WriteResource(JsonTextWriter writer, Resource resource)
+        {
+            WriteProperty(writer, resource.Name, () =>
+            {
+                WriteProperty(writer, "type", "object");
+                WriteProperty(writer, "properties", () =>
+                {
+                    WriteProperty(writer, "type", () =>
+                    {
+                        WriteProperty(writer, "enum", new string[]
+                        {
+                            resource.ResourceType
+                        });
+                    });
+
+                    WriteProperty(writer, "apiVersion", () =>
+                    {
+                        WriteProperty(writer, "enum", resource.ApiVersions);
+                    });
+
+                    WriteProperty(writer, "properties", () =>
+                    {
+                        WriteObjectOrExpression(writer, () =>
+                        {
+                            WriteProperty(writer, "type", "object");
+                            WriteProperty(writer, "properties", () =>
+                            {
+                                foreach (ResourceProperty property in resource.Properties)
+                                {
+                                    WriteResourceProperty(writer, property);
+                                }
+                            });
+                            WriteProperty(writer, "required", resource.RequiredPropertyNames);
+                        });
+                    });
+                });
+                WriteProperty(writer, "required", new string[]
+                {
+                    "type",
+                    "apiVersion",
+                    "properties",
+                    "location"
+                });
+                WriteProperty(writer, "description", resource.Description);
+            });
+        }
+
+        private static void WriteResourceProperty(JsonTextWriter writer, ResourceProperty resourceProperty)
+        {
+            WriteProperty(writer, resourceProperty.Name, () =>
+            {
+                WriteObjectOrExpression(writer, () =>
+                {
+                    if (resourceProperty.PropertyType != null)
+                    {
+                        WriteProperty(writer, "type", resourceProperty.PropertyType);
+                    }
+
+                    if (resourceProperty.AllowedValues != null)
+                    {
+                        WriteProperty(writer, "allowedValues", resourceProperty.AllowedValues);
+                    }
+                });
+                WriteProperty(writer, "description", resourceProperty.Description);
+            });
+        }
+
+        private static void WriteObject(JsonTextWriter writer, Action writeObjectContents)
+        {
+            writer.WriteStartObject();
+
+            writeObjectContents.Invoke();
+
+            writer.WriteEndObject();
+        }
+
+        private static void WriteExpressionReference(JsonTextWriter writer)
+        {
+            WriteObject(writer, () =>
+            {
+                WriteProperty(writer, "$ref", "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression");
+            });
+        }
+
+        private static void WriteObjectOrExpression(JsonTextWriter writer, Action writeObjectContents)
+        {
+            writer.WritePropertyName("oneOf");
+            writer.WriteStartArray();
+
+            WriteObject(writer, writeObjectContents);
+
+            WriteExpressionReference(writer);
+
+            writer.WriteEndArray();
+        }
+
+        private static void WriteProperty(JsonTextWriter writer, string propertyName, string propertyValue)
+        {
+            writer.WritePropertyName(propertyName);
+            writer.WriteValue(propertyValue);
+        }
+
+        private static void WriteProperty(JsonTextWriter writer, string propertyName, Action writeObjectContents)
+        {
+            writer.WritePropertyName(propertyName);
+            WriteObject(writer, writeObjectContents);
+        }
+
+        private static void WriteProperty(JsonTextWriter writer, string propertyName, IEnumerable<string> writeArrayContents)
+        {
+            writer.WritePropertyName(propertyName);
+            writer.WriteStartArray();
+
+            foreach (string value in writeArrayContents)
+            {
+                writer.WriteValue(value);
+            }
+
+            writer.WriteEndArray();
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Properties/AssemblyInfo.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Properties/AssemblyInfo.cs
index 34f7036d5899..37bc04b37366 100644
--- a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Properties/AssemblyInfo.cs
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Properties/AssemblyInfo.cs
@@ -1,5 +1,5 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: CLSCompliant(true)]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Resource.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Resource.cs
new file mode 100644
index 000000000000..1c64d2ef150b
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/Resource.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema
+{
+    public class Resource
+    {
+        private readonly string name;
+        private readonly string resourceType;
+        private readonly string[] apiVersions;
+        private readonly IEnumerable<ResourceProperty> properties;
+        private readonly string description;
+
+        public Resource(string name, string resourceType, string[] apiVersions, IEnumerable<ResourceProperty> properties, string description)
+        {
+            this.name = name;
+            this.resourceType = resourceType;
+            this.apiVersions = apiVersions;
+            this.properties = properties;
+            this.description = description;
+        }
+
+        public string Name
+        {
+            get { return name; }
+        }
+
+        public string ResourceType
+        {
+            get { return resourceType; }
+        }
+
+        public IEnumerable<string> ApiVersions
+        {
+            get { return apiVersions; }
+        }
+
+        public IEnumerable<ResourceProperty> Properties
+        {
+            get { return properties; }
+        }
+
+        public IEnumerable<string> RequiredPropertyNames
+        {
+            get { return Properties.Where(property => property.IsRequired).Select(property => property.Name).ToArray(); }
+        }
+
+        public string Description
+        {
+            get { return description; }
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceProperty.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceProperty.cs
new file mode 100644
index 000000000000..7212e90200bc
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceProperty.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema
+{
+    public class ResourceProperty
+    {
+        private readonly string name;
+        private readonly bool isRequired;
+        private readonly string propertyType;
+        private readonly IEnumerable<string> allowedValues;
+        private readonly string description;
+
+        public ResourceProperty(string name, bool isRequired, string propertyType, IEnumerable<string> allowedValues, string description)
+        {
+            this.name = name;
+            this.isRequired = isRequired;
+            this.propertyType = propertyType;
+            this.allowedValues = allowedValues;
+            this.description = description;
+        }
+
+        public string Name
+        {
+            get { return name; }
+        }
+
+        public bool IsRequired
+        {
+            get { return isRequired; }
+        }
+
+        public string PropertyType
+        {
+            get { return propertyType; }
+        }
+
+        public IEnumerable<string> AllowedValues
+        {
+            get { return allowedValues; }
+        }
+
+        public string Description
+        {
+            get { return description; }
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchema.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchema.cs
new file mode 100644
index 000000000000..c10ae6bb29b6
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/ResourceSchema.cs
@@ -0,0 +1,171 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+
+using Microsoft.Rest.Generator.ClientModel;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace Microsoft.Rest.Generator.AzureResourceSchema
+{
+    public class ResourceSchema
+    {
+        private const string resourceMethodPrefix = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/";
+
+        private readonly string id;
+        private readonly string title;
+        private readonly string description;
+        private readonly IEnumerable<Resource> resources;
+
+        private ResourceSchema(string id, string title, string description, IEnumerable<Resource> resources)
+        {
+            this.id = id;
+            this.title = title;
+            this.description = description;
+            this.resources = resources;
+        }
+
+        public string Id
+        {
+            get { return id; }
+        }
+
+        public string Title
+        {
+            get { return title; }
+        }
+
+        public string Description
+        {
+            get { return description; }
+        }
+
+        public IEnumerable<Resource> Resources
+        {
+            get { return resources; }
+        }
+
+        public static ResourceSchema Parse(ServiceClient serviceClient)
+        {
+            if (serviceClient == null)
+            {
+                throw new ArgumentNullException("serviceClient");
+            }
+
+            string resourceProvider = GetResourceProvider(serviceClient);
+            string apiVersion = serviceClient.ApiVersion;
+
+            string id = String.Format(CultureInfo.InvariantCulture, "http://schema.management.azure.com/schemas/{0}/{1}.json#", apiVersion, resourceProvider);
+
+            string title = resourceProvider;
+
+            string description = resourceProvider.Replace('.', ' ') + " Resource Types";
+
+            List<Resource> resources = new List<Resource>();
+            foreach (Method resourceMethod in GetResourceMethods(serviceClient))
+            {
+                // Azure "create resource" methods are always PUTs.
+                if (resourceMethod.HttpMethod == HttpMethod.Put)
+                {
+                    string resourceName = GetResourceName(resourceMethod);
+                    string resourceType = GetResourceType(resourceMethod);
+                    string[] apiVersions = new string[] { apiVersion };
+                    List<ResourceProperty> resourceProperties = new List<ResourceProperty>();
+                    string resourceDescription = resourceType;
+
+                    CompositeType body = resourceMethod.Body.Type as CompositeType;
+                    if (body != null)
+                    {
+                        CompositeType bodyProperties = body.Properties.Where(p => p.Name == "properties").Single().Type as CompositeType;
+                        if (bodyProperties != null)
+                        {
+                            foreach (Property property in bodyProperties.Properties)
+                            {
+                                string propertyName = property.Name;
+                                bool propertyIsRequired = property.IsRequired;
+                                string propertyType = null;
+                                string[] allowedValues = null;
+                                string propertyDescription = String.Format(CultureInfo.InvariantCulture, "{0}: {1}", resourceType, property.Documentation);
+
+                                if(property.Type is EnumType)
+                                {
+                                    propertyType = "string";
+
+                                    EnumType propertyEnumType = property.Type as EnumType;
+                                    allowedValues = new string[propertyEnumType.Values.Count];
+                                    for (int i = 0; i < propertyEnumType.Values.Count; ++i)
+                                    {
+                                        allowedValues[i] = propertyEnumType.Values[i].Name;
+                                    }
+                                }
+
+                                resourceProperties.Add(new ResourceProperty(propertyName, propertyIsRequired, propertyType, allowedValues, propertyDescription));
+                            }
+                        }
+                    }
+
+                    resources.Add(new Resource(resourceName, resourceType, apiVersions, resourceProperties, resourceDescription));
+                }
+            }
+
+            return new ResourceSchema(id, title, description, resources);
+        }
+
+        private static IEnumerable<Method> GetResourceMethods(ServiceClient serviceClient)
+        {
+            return serviceClient.Methods.Where(method => method.Url.StartsWith(resourceMethodPrefix, StringComparison.Ordinal));
+        }
+
+        private static string GetResourceProvider(ServiceClient serviceClient)
+        {
+            return GetResourceMethods(serviceClient).Select(GetResourceProvider).Distinct().Single();
+        }
+
+        private static string GetResourceProvider(Method resourceMethod)
+        {
+            string afterPrefix = resourceMethod.Url.Substring(resourceMethodPrefix.Length);
+            int firstForwardSlashAfterPrefix = afterPrefix.IndexOf('/');
+            return afterPrefix.Substring(0, firstForwardSlashAfterPrefix);
+        }
+
+        private static string GetResourceName(Method resourceMethod)
+        {
+            string afterPrefix = resourceMethod.Url.Substring(resourceMethodPrefix.Length);
+            int forwardSlashIndexAfterProvider = afterPrefix.IndexOf('/');
+            int resourceNameStartIndex = forwardSlashIndexAfterProvider + 1;
+            int forwardSlashIndexAfterResourceName = afterPrefix.IndexOf('/', resourceNameStartIndex);
+
+            string result;
+            if(forwardSlashIndexAfterResourceName == -1)
+            {
+                result = afterPrefix.Substring(resourceNameStartIndex);
+            }
+            else
+            {
+                result = afterPrefix.Substring(resourceNameStartIndex, forwardSlashIndexAfterResourceName - resourceNameStartIndex);
+            }
+
+            return result;
+        }
+
+        private static string GetResourceType(Method resourceMethod)
+        {
+            string afterPrefix = resourceMethod.Url.Substring(resourceMethodPrefix.Length);
+            int forwardSlashIndexAfterProvider = afterPrefix.IndexOf('/');
+            int forwardSlashIndexAfterResourceName = afterPrefix.IndexOf('/', forwardSlashIndexAfterProvider + 1);
+
+            string result;
+            if(forwardSlashIndexAfterResourceName == -1)
+            {
+                result = afterPrefix;
+            }
+            else
+            {
+                result = afterPrefix.Substring(0, forwardSlashIndexAfterResourceName);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/packages.config b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/packages.config
new file mode 100644
index 000000000000..505e58836bae
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
+</packages>
\ No newline at end of file
diff --git a/CodeGenerator.sln b/CodeGenerator.sln
index d7d8afd26af0..2e1b839e94d3 100644
--- a/CodeGenerator.sln
+++ b/CodeGenerator.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Core", "AutoRest\AutoRest.Core\AutoRest.Core.csproj", "{C876085F-9DC3-41F0-B7B4-17022CD84684}"
 EndProject
@@ -103,6 +103,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Modeler.CompositeS
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Modeler.CompositeSwagger.Tests", "AutoRest\Modelers\CompositeSwagger.Tests\AutoRest.Modeler.CompositeSwagger.Tests.csproj", "{DA37E6A9-5D59-45A3-A809-ABA85031C369}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureResourceSchema", "AzureResourceSchema", "{B6A1FC1E-0779-4900-84EE-262DD0E53FF4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.AzureResourceSchema", "AutoRest\Generators\AzureResourceSchema\AzureResourceSchema\AutoRest.Generator.AzureResourceSchema.csproj", "{654344A5-0556-49C7-BFB3-59676D7440D3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.AzureResourceSchema.Tests", "AutoRest\Generators\AzureResourceSchema\AzureResourceSchema.Tests\AutoRest.Generator.AzureResourceSchema.Tests.csproj", "{1C3B4A33-E045-4C8F-9202-1B651A686567}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Net45-Debug|Any CPU = Net45-Debug|Any CPU
@@ -311,6 +317,22 @@ Global
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Net45-Release|Any CPU.Build.0 = Net45-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU
+		{654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Net45-Release|Any CPU.Build.0 = Release|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C3B4A33-E045-4C8F-9202-1B651A686567}.Portable-Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -346,5 +368,8 @@ Global
 		{3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB} = {75E67F44-A8F8-4B4F-BEB0-0A9F8E65006C}
 		{31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8} = {02144BF6-4489-4AFC-9B2D-0306C3DD3C19}
 		{DA37E6A9-5D59-45A3-A809-ABA85031C369} = {02144BF6-4489-4AFC-9B2D-0306C3DD3C19}
+		{B6A1FC1E-0779-4900-84EE-262DD0E53FF4} = {EF9E346D-70C6-45F5-8FF9-9B734F4A1298}
+		{654344A5-0556-49C7-BFB3-59676D7440D3} = {B6A1FC1E-0779-4900-84EE-262DD0E53FF4}
+		{1C3B4A33-E045-4C8F-9202-1B651A686567} = {B6A1FC1E-0779-4900-84EE-262DD0E53FF4}
 	EndGlobalSection
 EndGlobal