diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.csproj b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.csproj
deleted file mode 100644
index 31b13e6afe8a..000000000000
--- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.csproj
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-
- ..\..\..\..\
- AnyCPU
- net45
- 10.0.0
- 2.0
- {CA4DDAA2-9558-47B9-8838-A077A628E94C}
- Library
- Microsoft.Rest.Generator.CSharp.Azure.Tests
- AutoRest.Generator.Azure.CSharp.Tests
- true
- true
- d278bbe5
- Net45-Debug
-
-
-
- false
- bin\Net45-Debug
- 4
-
-
-
-
-
-
- $(SolutionDir)\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll
-
-
- ..\..\..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll
- True
-
-
- ..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll
- True
-
-
- False
- ..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll
- True
-
-
-
-
-
-
-
- {856a1d19-c3bf-439a-bebf-e822a332bc12}
- ClientRuntime.Azure
-
-
- {7f524559-93f9-4f3f-9e2c-af41a0c2e6f4}
- ClientRuntime
-
-
- {c876085f-9dc3-41f0-b7b4-17022cd84684}
- AutoRest.Core
-
-
- {c6c4e139-d7af-486c-95ba-2b879f58f18d}
- AutoRest.Modeler.Swagger.Tests
-
-
- {9517265e-5127-460c-9dde-fe017d73121c}
- AutoRest.Modeler.Swagger
-
-
- {4899b527-6815-4e89-84b3-dd5a507b205a}
- AutoRest.Generator.Azure.CSharp
-
-
- {84211169-9441-44f9-b626-10bf75ff25a6}
- AutoRest.Generator.CSharp.Tests
-
-
- {CC1EEC95-41EF-44B6-8761-00FA3E647248}
- AutoRest.Generator.CSharp
-
-
-
-
- AutoRest.json
- PreserveNewest
-
-
- Swagger\body-duration.json
- PreserveNewest
-
-
-
-
-
-
- PreserveNewest
-
-
-
-
-
- Designer
-
-
-
-
-
-
-
-
-
-
- True
- True
- Resources.resx
-
-
- PreserveNewest
-
-
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
-
\ No newline at end of file
diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Azure.CSharp.Tests.xproj b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Azure.CSharp.Tests.xproj
new file mode 100644
index 000000000000..88289c226476
--- /dev/null
+++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Azure.CSharp.Tests.xproj
@@ -0,0 +1,21 @@
+
+
+
+ 14.0.25123
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 43dfef27-2fd7-4827-a669-dfd2dd1cbbcc
+ Azure.CSharp.Tests
+ .\obj
+ .\bin\
+
+
+ 2.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.csproj b/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.csproj
deleted file mode 100644
index 11e8a1170464..000000000000
--- a/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.csproj
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
-
-
-
-
-
- ..\..\..\..\
- AnyCPU
- net45
- 10.0.0
- 2.0
- {84211169-9441-44F9-B626-10BF75FF25A6}
- Library
- Microsoft.Rest.Generator.CSharp.Tests
- AutoRest.Generator.CSharp.Tests
- true
- true
- e5346310
- Net45-Debug
-
-
-
- false
- bin\Net45-Debug
- 4
-
-
- 1570;1591
-
-
-
-
-
-
- $(SolutionDir)\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll
-
-
- ..\..\..\..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll
- True
-
-
- ..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll
- True
-
-
- False
- ..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll
- True
-
-
-
-
-
-
-
- {7f524559-93f9-4f3f-9e2c-af41a0c2e6f4}
- ClientRuntime
-
-
- {c876085f-9dc3-41f0-b7b4-17022cd84684}
- AutoRest.Core
-
-
- {c6c4e139-d7af-486c-95ba-2b879f58f18d}
- AutoRest.Modeler.Swagger.Tests
-
-
- {cc1eec95-41ef-44b6-8761-00fa3e647248}
- AutoRest.Generator.CSharp
-
-
-
-
- AutoRest.json
- PreserveNewest
-
-
- Swagger\azure-report.json
- PreserveNewest
-
-
- Swagger\azure-special-properties.json
- PreserveNewest
-
-
- Swagger\body-array.json
- PreserveNewest
-
-
- Swagger\body-boolean.json
- PreserveNewest
-
-
- Swagger\body-byte.json
- PreserveNewest
-
-
- Swagger\body-complex.json
- PreserveNewest
-
-
- Swagger\body-date.json
- PreserveNewest
-
-
- Swagger\body-datetime.json
- PreserveNewest
-
-
- Swagger\body-datetime-rfc1123.json
- PreserveNewest
-
-
- Swagger\body-duration.json
- PreserveNewest
-
-
- Swagger\body-dictionary.json
- PreserveNewest
-
-
- Swagger\body-file.json
- PreserveNewest
-
-
- Swagger\body-integer.json
- PreserveNewest
-
-
- Swagger\body-number.json
- PreserveNewest
-
-
- Swagger\body-string.json
- PreserveNewest
-
-
- Swagger\head.json
- PreserveNewest
-
-
- Swagger\header.json
- PreserveNewest
-
-
- Swagger\httpInfrastructure.json
- PreserveNewest
-
-
- Swagger\lro.json
- PreserveNewest
-
-
- Swagger\paging.json
- PreserveNewest
-
-
- Swagger\report.json
- PreserveNewest
-
-
- Swagger\required-optional.json
- PreserveNewest
-
-
- Swagger\resource-flattening-reference.json
- PreserveNewest
-
-
- Swagger\resource-flattening.json
- PreserveNewest
-
-
- Swagger\subscriptionId-apiVersion.json
- PreserveNewest
-
-
- Swagger\url.json
- PreserveNewest
-
-
- Swagger\validation.json
- PreserveNewest
-
-
- Designer
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
-
-
- Designer
-
-
-
-
-
- PreserveNewest
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- sample.png
- PreserveNewest
-
-
-
-
-
-
-
-
-
-
- This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
-
\ No newline at end of file
diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/CSharp.Tests.xproj b/AutoRest/Generators/CSharp/CSharp.Tests/CSharp.Tests.xproj
new file mode 100644
index 000000000000..c16dbe98a959
--- /dev/null
+++ b/AutoRest/Generators/CSharp/CSharp.Tests/CSharp.Tests.xproj
@@ -0,0 +1,21 @@
+
+
+
+ 14.0.25123
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+
+
+
+ 784d4b45-f12a-4b8f-a86c-35a080814a19
+ CSharp.Tests
+ .\obj
+ .\bin\
+
+
+ 2.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ClientRuntime.sln b/ClientRuntime.sln
index e49b38b6e06b..263c4723b4ad 100644
--- a/ClientRuntime.sln
+++ b/ClientRuntime.sln
@@ -1,28 +1,34 @@
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("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime\Microsoft.Rest.ClientRuntime.xproj", "{EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime\Microsoft.Rest.ClientRuntime.xproj", "{EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure\Microsoft.Rest.ClientRuntime.Azure.xproj", "{D5296EAB-C13E-4A88-9532-BD0677D18EC9}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime.Azure", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure\Microsoft.Rest.ClientRuntime.Azure.xproj", "{D5296EAB-C13E-4A88-9532-BD0677D18EC9}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Tests\Microsoft.Rest.ClientRuntime.Tests.xproj", "{F7F20E35-43EE-4FCC-BF83-7BF93B192BC8}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Tests\Microsoft.Rest.ClientRuntime.Tests.xproj", "{F7F20E35-43EE-4FCC-BF83-7BF93B192BC8}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Log4Net", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Log4Net\Microsoft.Rest.ClientRuntime.Log4Net.xproj", "{348E414F-101A-4939-99FF-2C994A965A89}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime.Log4Net", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Log4Net\Microsoft.Rest.ClientRuntime.Log4Net.xproj", "{348E414F-101A-4939-99FF-2C994A965A89}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Etw", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Etw\Microsoft.Rest.ClientRuntime.Etw.xproj", "{218D7297-8254-4C70-9C04-33C3D5EE9709}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime.Etw", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Etw\Microsoft.Rest.ClientRuntime.Etw.xproj", "{218D7297-8254-4C70-9C04-33C3D5EE9709}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Tracing.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Tracing.Tests\Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj", "{52C61F15-BF86-41DC-93D1-05D3DA70F032}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime.Tracing.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Tracing.Tests\Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj", "{52C61F15-BF86-41DC-93D1-05D3DA70F032}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{70D6E596-4444-489F-AE19-83EE0B0D6877}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
EndProjectSection
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure.Tests\Microsoft.Rest.ClientRuntime.Azure.Tests.xproj", "{3B2346E5-5D1F-4B0A-AEEE-F3AFB9583A72}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime.Azure.Tests", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure.Tests\Microsoft.Rest.ClientRuntime.Azure.Tests.xproj", "{3B2346E5-5D1F-4B0A-AEEE-F3AFB9583A72}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime.Azure.Authentication", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure.Authentication\Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj", "{6319205D-BBFC-4150-BEAE-31B1C9B911DD}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Rest.ClientRuntime.Azure.Authentication", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime.Azure.Authentication\Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj", "{6319205D-BBFC-4150-BEAE-31B1C9B911DD}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CSharp.Tests", "AutoRest\Generators\CSharp\CSharp.Tests\CSharp.Tests.xproj", "{784D4B45-F12A-4B8F-A86C-35A080814A19}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Azure.CSharp.Tests", "AutoRest\Generators\CSharp\Azure.CSharp.Tests\Azure.CSharp.Tests.xproj", "{43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GeneratorTests", "GeneratorTests", "{0B59BFFC-587F-4E08-987C-82CCB57426B1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -62,8 +68,20 @@ Global
{6319205D-BBFC-4150-BEAE-31B1C9B911DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6319205D-BBFC-4150-BEAE-31B1C9B911DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6319205D-BBFC-4150-BEAE-31B1C9B911DD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {784D4B45-F12A-4B8F-A86C-35A080814A19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {784D4B45-F12A-4B8F-A86C-35A080814A19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {784D4B45-F12A-4B8F-A86C-35A080814A19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {784D4B45-F12A-4B8F-A86C-35A080814A19}.Release|Any CPU.Build.0 = Release|Any CPU
+ {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {784D4B45-F12A-4B8F-A86C-35A080814A19} = {0B59BFFC-587F-4E08-987C-82CCB57426B1}
+ {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC} = {0B59BFFC-587F-4E08-987C-82CCB57426B1}
+ EndGlobalSection
EndGlobal
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj
index 24f600dd71df..41757eecceba 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj
@@ -11,10 +11,12 @@
.\obj
.\bin\
-
2.0
+
+
+
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj
index c9ee1ae8e173..90dfc5b68cc1 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj
@@ -11,10 +11,12 @@
.\obj
.\bin\
-
2.0
+
+
+
\ No newline at end of file