diff --git a/AutoRest.sln b/AutoRest.sln
index b11b89d798ca5..e9e2ddf312323 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 0451285cb520a..2af544a885822 100644
--- a/AutoRest/AutoRest.Core/AutoRest.nuspec
+++ b/AutoRest/AutoRest.Core/AutoRest.nuspec
@@ -31,6 +31,7 @@
+
diff --git a/AutoRest/AutoRest/AutoRest.Release.json b/AutoRest/AutoRest/AutoRest.Release.json
index b488b12ca1fc8..f368702db7a63 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 b488b12ca1fc8..f368702db7a63 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/AcceptanceTests.cs b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AcceptanceTests.cs
new file mode 100644
index 0000000000000..97cbab6189e36
--- /dev/null
+++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AcceptanceTests.cs
@@ -0,0 +1,57 @@
+// 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.AzureResourceSchema;
+using Microsoft.Rest.Modeler.Swagger.Tests;
+using System.IO;
+using Xunit;
+
+namespace AutoRest.Generator.AzureResourceSchema.Tests
+{
+ [Collection("AutoRest Azure Resource Schema Tests")]
+ public static class AcceptanceTests
+ {
+ [Fact]
+ public static void Storage()
+ {
+ RunSwaggerTest("storage.json", "Storage");
+ }
+
+ [Fact]
+ public static void Batch()
+ {
+ RunSwaggerTest("BatchManagement.json", "Batch");
+ }
+
+ [Fact]
+ public static void Cdn()
+ {
+ RunSwaggerTest("cdn.json", "CDN");
+ }
+
+ [Fact]
+ public static void Compute()
+ {
+ RunSwaggerTest("compute.json", "Compute");
+ }
+
+ [Fact]
+ public static void Network()
+ {
+ RunSwaggerTest("network.json", "Network");
+ }
+
+ [Fact]
+ public static void Web()
+ {
+ RunSwaggerTest("web.json", "Web");
+ }
+
+ private static void RunSwaggerTest(string swaggerFileName, string expectedFolderName)
+ {
+ SwaggerSpecHelper.RunTests(
+ Path.Combine("Swagger", swaggerFileName),
+ Path.Combine("Expected", expectedFolderName));
+ }
+ }
+}
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 01522ea89f2b4..3624fde45de91 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 @@
-
-
+
+
+
Debug
@@ -8,6 +9,7 @@
{1C3B4A33-E045-4C8F-9202-1B651A686567}
Library
Properties
+ Microsoft.Rest.Generator.AzureResourceSchema.Tests
AutoRest.Generator.AzureResourceSchema.Tests
AutoRest.Generator.AzureResourceSchema.Tests
v4.5.2
@@ -33,6 +35,10 @@
4
+
+ ..\..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll
+ True
+
@@ -42,42 +48,104 @@
- ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll
+ ..\..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll
True
- ..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll
+ ..\..\..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll
True
- ..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll
+ ..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll
True
- ..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll
+ ..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll
True
+
+
+
+
+
+
+
+
+ {c876085f-9dc3-41f0-b7b4-17022cd84684}
+ AutoRest.Core
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ {c6c4e139-d7af-486c-95ba-2b879f58f18d}
+ AutoRest.Modeler.Swagger.Tests
+
{654344a5-0556-49c7-bfb3-59676d7440d3}
AutoRest.Generator.AzureResourceSchema
+
+
+
+
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}.
-
+
+