diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/ClientRuntime.Azure.Authentication.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/ClientRuntime.Azure.Authentication.xproj
deleted file mode 100644
index de38a4855c..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/ClientRuntime.Azure.Authentication.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 6319205d-bbfc-4150-beae-31b1c9b911dd
- Microsoft.Rest.ClientRuntime.Azure.Authentication
- obj\$(MSBuildProjectName)
- bin
-
-
- 2.0
-
-
- True
-
-
-
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ClientRuntime.Azure.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ClientRuntime.Azure.Tests.xproj
deleted file mode 100644
index 3950742baf..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ClientRuntime.Azure.Tests.xproj
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 3b2346e5-5d1f-4b0a-aeee-f3afb9583a72
- Microsoft.Rest.ClientRuntime.Azure.Tests
- obj\$(MSBuildProjectName)
- bin\$(MSBuildProjectName)\
-
-
- 2.0
- True
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/ClientRuntime.Azure.csproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/ClientRuntime.Azure.csproj
deleted file mode 100644
index 84b0218204..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/ClientRuntime.Azure.csproj
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
- ..\..\..\
- AnyCPU
- net45
- {856A1D19-C3BF-439A-BEBF-E822A332BC12}
- Properties
- Microsoft.Rest.Azure
- Microsoft.Rest.ClientRuntime.Azure
- Library
- true
- Microsoft.Rest.ClientRuntime.Azure
- Net45-Debug
-
-
-
- false
- bin\Net45-Debug
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- True
- True
- Resources.resx
-
-
- ResXFileCodeGenerator
- Resources.Designer.cs
-
-
-
-
-
-
-
- CustomDictionary.xml
-
-
-
-
-
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/ClientRuntime.Azure.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/ClientRuntime.Azure.xproj
deleted file mode 100644
index ece57448cc..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/ClientRuntime.Azure.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- {d5296eab-c13e-4a88-9532-bd0677d18ec9}
- Microsoft.Rest.ClientRuntime.Azure
- obj\$(Configuration)
- bin
-
-
- 2.0
-
-
- True
-
-
-
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/ClientRuntime.Etw.csproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/ClientRuntime.Etw.csproj
deleted file mode 100644
index 964c013f80..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/ClientRuntime.Etw.csproj
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
- ..\..\..\
- AnyCPU
- net45
- {50B0A8CE-D290-4EB7-8C6C-16EAAB75225E}
- Net45-Debug
- Properties
- Microsoft.Rest.Tracing.Etw
- Microsoft.Rest.ClientRuntime.Etw
- Library
- true
- 644881db
- Net45-Debug
-
-
-
- false
- bin\Net45-Debug
- 4
-
-
-
-
-
-
-
-
-
- Designer
-
-
-
-
-
- CustomDictionary.xml
-
-
-
-
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/ClientRuntime.Etw.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/ClientRuntime.Etw.xproj
deleted file mode 100644
index 492aba7984..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/ClientRuntime.Etw.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 218d7297-8254-4c70-9c04-33c3d5ee9709
- Microsoft.Rest.ClientRuntime
- obj\$(MSBuildProjectName)
- bin\$(MSBuildProjectName)\
-
-
- 2.0
-
-
- True
-
-
-
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/ClientRuntime.Log4Net.csproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/ClientRuntime.Log4Net.csproj
deleted file mode 100644
index a69e35a232..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/ClientRuntime.Log4Net.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
- ..\..\..\
- AnyCPU
- net45
- {2EFD6648-39B4-476A-B302-8BC236F5F1B8}
- Net40-Debug
- Properties
- Microsoft.Rest.Tracing.Log4Net
- Library
- true
- e31a3ee2
- Microsoft.Rest.ClientRuntime.Log4Net
- Net45-Debug
-
-
-
- false
- bin\Net45-Debug
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(SolutionDir)\packages\log4net.2.0.3\lib\net40-full\log4net.dll
-
-
-
-
- CustomDictionary.xml
-
-
-
-
-
-
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/ClientRuntime.Log4Net.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/ClientRuntime.Log4Net.xproj
deleted file mode 100644
index d894cdd6a9..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/ClientRuntime.Log4Net.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 348e414f-101a-4939-99ff-2c994a965a89
- Microsoft.Rest.ClientRuntime
- obj\$(MSBuildProjectName)
- bin\$(MSBuildProjectName)\
-
-
- 2.0
-
-
- True
-
-
-
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/ClientRuntime.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/ClientRuntime.Tests.xproj
deleted file mode 100644
index e7b88124dd..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/ClientRuntime.Tests.xproj
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- f7f20e35-43ee-4fcc-bf83-7bf93b192bc8
- Microsoft.Rest.ClientRuntime.Tests
- obj\$(MSBuildProjectName)
- bin\$(MSBuildProjectName)\
-
-
- 2.0
- True
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/ClientRuntime.Tracing.Tests.csproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/ClientRuntime.Tracing.Tests.csproj
deleted file mode 100644
index c2a5eab70b..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/ClientRuntime.Tracing.Tests.csproj
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
- ..\..\..\
- Debug
- net45
- AnyCPU
- {B2FAA0E6-2643-4011-8CFE-BA28BDFFC7E7}
- Library
- Properties
- Microsoft.Rest.ClientRuntime.Tracing.Tests
- ClientRuntime.Tracing.Tests
- true
- 512
- true
- 97e3a46b
- Net45-Debug
-
-
-
- false
- bin\Net45-Debug
- 4
-
-
- <_DiagnosticsTracingPackageName>Microsoft.Diagnostics.Tracing.TraceEvent.1.0.5
- <_DiagnosticsTracingTargets>$(SolutionDir)packages\$(_DiagnosticsTracingPackageName)\tools\Microsoft.Diagnostics.Tracing.TraceEvent.targets
-
-
-
- False
- $(SolutionDir)packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.11\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll
-
-
- False
-
-
- ..\..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll
- True
-
-
- ..\..\..\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
-
-
- ..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll
- True
-
-
-
-
-
-
-
-
-
- PreserveNewest
-
-
-
-
-
- {50b0a8ce-d290-4eb7-8c6c-16eaab75225e}
- ClientRuntime.Etw
-
-
- {2efd6648-39b4-476a-b302-8bc236f5f1b8}
- ClientRuntime.Log4Net
-
-
-
-
-
-
-
-
-
- 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/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/ClientRuntime.Tracing.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/ClientRuntime.Tracing.Tests.xproj
deleted file mode 100644
index 67c1c975bd..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/ClientRuntime.Tracing.Tests.xproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- 52c61f15-bf86-41dc-93d1-05d3da70f032
- Microsoft.Rest.ClientRuntime.Tracing.Tests
- obj\$(MSBuildProjectName)
- bin\$(MSBuildProjectName)\
-
-
- 2.0
- True
-
-
-
-
\ No newline at end of file
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Log4NetTracingInterceptorTest.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Log4NetTracingInterceptorTest.cs
index ba1259354d..4e56f21dbb 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Log4NetTracingInterceptorTest.cs
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Log4NetTracingInterceptorTest.cs
@@ -17,7 +17,7 @@ public class Log4NetTracingInterceptorTest
[Fact]
public void LogsConfiguration()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string expected = "DEBUG - Configuration: source=sourceName, name=Name, value=Value\r\n";
logger.Configuration("sourceName", "Name", "Value");
Assert.Equal(expected, File.ReadAllText(logFileName));
@@ -26,7 +26,7 @@ public void LogsConfiguration()
[Fact]
public void LogsInformation()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string infoMessage = "This is expected message";
string expected = string.Format("INFO - {0}\r\n", infoMessage);
logger.Information(infoMessage);
@@ -36,7 +36,7 @@ public void LogsInformation()
[Fact]
public void LogsEnter()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = "1234";
object instance = "I'm an object";
string method = "getData";
@@ -52,7 +52,7 @@ public void LogsEnter()
[Fact]
public void LogsRequest()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = "12345";
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, "http://azuresdk.com");
string expected = string.Format("DEBUG - invocationId: {0}\r\nrequest: {1}\r\n", invocationId,
@@ -65,7 +65,7 @@ public void LogsRequest()
[Fact]
public void LogsResponse()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = "12345";
HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.Accepted);
string expected = string.Format("DEBUG - invocationId: {0}\r\nresponse: {1}\r\n", invocationId,
@@ -78,7 +78,7 @@ public void LogsResponse()
[Fact]
public void LogsError()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = "12345";
var exception = new HttpOperationException("I'm a cloud exception!");
string expected = string.Format("ERROR - invocationId: {0}\r\n{1}\r\n", invocationId, exception.ToString());
@@ -90,7 +90,7 @@ public void LogsError()
[Fact]
public void LogsExit()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = "12345";
string returnValue = "bye bye!";
string expected = string.Format("DEBUG - Exit with invocation id {0}, the return value is {1}\r\n",
@@ -103,7 +103,7 @@ public void LogsExit()
[Fact]
public void LogsNullConfiguration()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string expected = "DEBUG - Configuration: source=, name=, value=\r\n";
logger.Configuration(null, null, null);
Assert.Equal(expected, File.ReadAllText(logFileName));
@@ -112,7 +112,7 @@ public void LogsNullConfiguration()
[Fact]
public void LogsNullInformation()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string infoMessage = null;
string expected = string.Format("INFO - {0}\r\n", infoMessage);
logger.Information(infoMessage);
@@ -122,7 +122,7 @@ public void LogsNullInformation()
[Fact]
public void LogsNullEnter()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = null;
object instance = null;
string method = null;
@@ -138,7 +138,7 @@ public void LogsNullEnter()
[Fact]
public void LogsNullRequest()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = null;
HttpRequestMessage request = null;
string expected = "DEBUG - invocationId: \r\nrequest: \r\n";
@@ -149,7 +149,7 @@ public void LogsNullRequest()
[Fact]
public void LogsNullResponse()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = null;
HttpResponseMessage response = null;
string expected = "DEBUG - invocationId: \r\nresponse: \r\n";
@@ -160,7 +160,7 @@ public void LogsNullResponse()
[Fact]
public void LogsNullError()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = null;
string expected = string.Format("ERROR - invocationId: \r\n", invocationId, null);
logger.TraceError(invocationId, null);
@@ -171,7 +171,7 @@ public void LogsNullError()
[Fact]
public void LogsNullExit()
{
- Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("app.config");
+ Log4NetTracingInterceptor logger = new Log4NetTracingInterceptor("Microsoft.Rest.ClientRuntime.Tracing.Tests.dll.config");
string invocationId = null;
string returnValue = null;
string expected = string.Format("DEBUG - Exit with invocation id {0}, the return value is {1}\r\n",
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json
index 7abe91796d..4730611472 100644
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json
+++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json
@@ -9,15 +9,22 @@
"testRunner": "xunit",
"frameworks": {
"net45": {
- "imports": ["netcoreapp1.0", "dnxcore50"]
+ "imports": ["net451","dnxcore50"],
+ "frameworkAssemblies": {
+ "System": "",
+ "System.Runtime": "",
+ "System.Threading": ""
+ }
}
},
"dependencies": {
- "Microsoft.NETCore.App": "1.0.0-rc2-24008",
+ "Microsoft.NETCore.Platforms": "1.0.1-rc2-23931",
+ "Microsoft.NETCore.Runtime": "1.0.2-rc2-23931",
"Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.39",
"Microsoft.Rest.ClientRuntime.Log4Net": "[2.0.0-preview,3.0.0)",
"Microsoft.Rest.ClientRuntime.Etw": "[2.0.0-preview,3.0.0)",
+ "Newtonsoft.Json": "7.0.1",
"xunit": "2.1.0",
- "dotnet-test-xunit": "1.0.0-dev-140469-38"
+ "dotnet-test-xunit": "1.0.0-rc2-157751-46"
}
}
diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ClientRuntime.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ClientRuntime.xproj
deleted file mode 100644
index 9ec1066d1f..0000000000
--- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ClientRuntime.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
- 14.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
-
- eddb6367-5c7b-428c-b54c-96bcd90f6e6c
- Microsoft.Rest.ClientRuntime
- obj\$(Configuration)
- bin
-
-
- 2.0
-
-
- True
-
-
-
\ No newline at end of file