diff --git a/.gitignore b/.gitignore index 2f1f57f8d519d..7150646c5d3f4 100644 --- a/.gitignore +++ b/.gitignore @@ -176,8 +176,6 @@ Thumbs.db AutoRest/Generators/Ruby/*Tests/Gemfile.lock AutoRest/Generators/Ruby/*/RspecTests/Generated/* -#dnx installation -dnx-clr-win-x86*/ -dnx-coreclr-win-x86*/ -*.lock.json -/dnx +#netcore +/NetCore +*.lock.json \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 51223465035c8..3eaf4ac380f4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: csharp -sudo: false -mono: - - beta +sudo: required +dist: trusty addons: apt: sources: @@ -16,14 +15,7 @@ addons: # packages for python - python3.5 install: - # Install libunwind required for DNX - - wget http://download.savannah.gnu.org/releases/libunwind/libunwind-1.1.tar.gz - - tar xzvf libunwind-1.1.tar.gz - - libunwind-1.1/configure --prefix=$HOME/.local - - make && make install - - export LD_LIBRARY_PATH=$HOME/.local/lib/:$LD_LIBRARY_PATH # Install npm - - curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | sh && source ~/.dnx/dnvm/dnvm.sh && dnvm upgrade - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 4 - npm install -g npm@'>=1.4.3' - npm install @@ -38,10 +30,12 @@ install: - echo y | ./android/android-sdk-linux/tools/android update sdk --all --filter platform-tools,android-23,build-tools-23.0.1 --no-ui --force - echo y | ./android/android-sdk-linux/tools/android update sdk --all --filter extra-android-support,extra-android-m2repository,extra-google-m2repository --no-ui --force - export ANDROID_HOME=`pwd`/android/android-sdk-linux + # Install NetCore RC2 + - sudo sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' + - sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 + - sudo apt-get update + - sudo apt-get install dotnet-dev-1.0.0-preview1-002702 -y script: - - dnvm install 1.0.0-rc1-final -r mono - - dnvm install 1.0.0-rc1-final -r coreclr - - dnvm use 1.0.0-rc1-final -r coreclr -persistent - gulp after_script: - echo "========== Server log: ============" diff --git a/AutoRest.sln b/AutoRest.sln index e9e2ddf312323..c3c9fe2c2148a 100644 --- a/AutoRest.sln +++ b/AutoRest.sln @@ -82,15 +82,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution schema\swagger-extensions.json = schema\swagger-extensions.json EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoRest.Generator.CSharp.Tests", "AutoRest\Generators\CSharp\CSharp.Tests\AutoRest.Generator.CSharp.Tests.xproj", "{7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoRest.Generator.Azure.CSharp.Tests", "AutoRest\Generators\CSharp\Azure.CSharp.Tests\AutoRest.Generator.Azure.CSharp.Tests.xproj", "{729D041A-180E-47A4-AB77-6C7CA72F40C3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClientRuntimes", "ClientRuntimes", "{9C3EF315-B4C1-4E11-B2FC-31B1530393D9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClientRuntime", "ClientRuntimes\CSharp\Microsoft.Rest.ClientRuntime\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\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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.Azure.Extensions", "AutoRest\Generators\Extensions\Azure.Extensions\AutoRest.Generator.Azure.Extensions.csproj", "{90B943AB-3879-4B64-B9FF-1A21297C0F26}" EndProject @@ -124,14 +120,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoRest.Generator.AzureRes 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 +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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Net45-Debug|Any CPU = Net45-Debug|Any CPU Net45-Release|Any CPU = Net45-Release|Any CPU Portable-Debug|Any CPU = Portable-Debug|Any CPU Portable-Release|Any CPU = Portable-Release|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C876085F-9DC3-41F0-B7B4-17022CD84684}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {C876085F-9DC3-41F0-B7B4-17022CD84684}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {C876085F-9DC3-41F0-B7B4-17022CD84684}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {C876085F-9DC3-41F0-B7B4-17022CD84684}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {C876085F-9DC3-41F0-B7B4-17022CD84684}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -140,6 +144,10 @@ Global {C876085F-9DC3-41F0-B7B4-17022CD84684}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {C876085F-9DC3-41F0-B7B4-17022CD84684}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {C876085F-9DC3-41F0-B7B4-17022CD84684}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {C876085F-9DC3-41F0-B7B4-17022CD84684}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {C876085F-9DC3-41F0-B7B4-17022CD84684}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -148,6 +156,10 @@ Global {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {F589D8B7-1B0F-4182-842B-09866A4A2CEB}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -156,6 +168,10 @@ Global {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {31E6BAA3-C606-4D44-B0D7-46BE7AFAC656}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {9517265E-5127-460C-9DDE-FE017D73121C}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {9517265E-5127-460C-9DDE-FE017D73121C}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {9517265E-5127-460C-9DDE-FE017D73121C}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {9517265E-5127-460C-9DDE-FE017D73121C}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {9517265E-5127-460C-9DDE-FE017D73121C}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -164,6 +180,10 @@ Global {9517265E-5127-460C-9DDE-FE017D73121C}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {9517265E-5127-460C-9DDE-FE017D73121C}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {9517265E-5127-460C-9DDE-FE017D73121C}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {9517265E-5127-460C-9DDE-FE017D73121C}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {9517265E-5127-460C-9DDE-FE017D73121C}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -172,6 +192,10 @@ Global {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {C6C4E139-D7AF-486C-95BA-2B879F58F18D}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {4899B527-6815-4E89-84B3-DD5A507B205A}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {4899B527-6815-4E89-84B3-DD5A507B205A}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {4899B527-6815-4E89-84B3-DD5A507B205A}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {4899B527-6815-4E89-84B3-DD5A507B205A}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {4899B527-6815-4E89-84B3-DD5A507B205A}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -180,6 +204,10 @@ Global {4899B527-6815-4E89-84B3-DD5A507B205A}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {4899B527-6815-4E89-84B3-DD5A507B205A}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {4899B527-6815-4E89-84B3-DD5A507B205A}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {4899B527-6815-4E89-84B3-DD5A507B205A}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {4899B527-6815-4E89-84B3-DD5A507B205A}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -188,6 +216,10 @@ Global {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {CC1EEC95-41EF-44B6-8761-00FA3E647248}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -196,6 +228,10 @@ Global {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {909BF4EF-4ECA-4AC4-8E21-CDCF05393161}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {77E73F37-9586-44EA-91B0-F244D08467D2}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {77E73F37-9586-44EA-91B0-F244D08467D2}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {77E73F37-9586-44EA-91B0-F244D08467D2}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {77E73F37-9586-44EA-91B0-F244D08467D2}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {77E73F37-9586-44EA-91B0-F244D08467D2}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -204,6 +240,10 @@ Global {77E73F37-9586-44EA-91B0-F244D08467D2}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {77E73F37-9586-44EA-91B0-F244D08467D2}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {77E73F37-9586-44EA-91B0-F244D08467D2}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {77E73F37-9586-44EA-91B0-F244D08467D2}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {77E73F37-9586-44EA-91B0-F244D08467D2}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {A7780698-3072-486E-A105-81EDDF552598}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {A7780698-3072-486E-A105-81EDDF552598}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {A7780698-3072-486E-A105-81EDDF552598}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {A7780698-3072-486E-A105-81EDDF552598}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {A7780698-3072-486E-A105-81EDDF552598}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -212,6 +252,10 @@ Global {A7780698-3072-486E-A105-81EDDF552598}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {A7780698-3072-486E-A105-81EDDF552598}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {A7780698-3072-486E-A105-81EDDF552598}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {A7780698-3072-486E-A105-81EDDF552598}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {A7780698-3072-486E-A105-81EDDF552598}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {31931998-7543-41DA-9E58-D9670D810352}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {31931998-7543-41DA-9E58-D9670D810352}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {31931998-7543-41DA-9E58-D9670D810352}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {31931998-7543-41DA-9E58-D9670D810352}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {31931998-7543-41DA-9E58-D9670D810352}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -220,6 +264,10 @@ Global {31931998-7543-41DA-9E58-D9670D810352}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {31931998-7543-41DA-9E58-D9670D810352}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {31931998-7543-41DA-9E58-D9670D810352}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {31931998-7543-41DA-9E58-D9670D810352}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {31931998-7543-41DA-9E58-D9670D810352}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -228,6 +276,10 @@ Global {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {313D65A7-5A0C-48AA-AF93-8A11364FC5D5}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {34B82690-0083-4F4C-8ABF-2D2A09304915}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {34B82690-0083-4F4C-8ABF-2D2A09304915}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {34B82690-0083-4F4C-8ABF-2D2A09304915}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {34B82690-0083-4F4C-8ABF-2D2A09304915}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {34B82690-0083-4F4C-8ABF-2D2A09304915}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -236,6 +288,10 @@ Global {34B82690-0083-4F4C-8ABF-2D2A09304915}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {34B82690-0083-4F4C-8ABF-2D2A09304915}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {34B82690-0083-4F4C-8ABF-2D2A09304915}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {34B82690-0083-4F4C-8ABF-2D2A09304915}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {34B82690-0083-4F4C-8ABF-2D2A09304915}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -244,6 +300,10 @@ Global {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -252,22 +312,10 @@ Global {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}.Net45-Release|Any CPU.Build.0 = Release|Any CPU - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4}.Portable-Release|Any CPU.Build.0 = Release|Any CPU - {729D041A-180E-47A4-AB77-6C7CA72F40C3}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU - {729D041A-180E-47A4-AB77-6C7CA72F40C3}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU - {729D041A-180E-47A4-AB77-6C7CA72F40C3}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU - {729D041A-180E-47A4-AB77-6C7CA72F40C3}.Net45-Release|Any CPU.Build.0 = Release|Any CPU - {729D041A-180E-47A4-AB77-6C7CA72F40C3}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU - {729D041A-180E-47A4-AB77-6C7CA72F40C3}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU - {729D041A-180E-47A4-AB77-6C7CA72F40C3}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU - {729D041A-180E-47A4-AB77-6C7CA72F40C3}.Portable-Release|Any CPU.Build.0 = Release|Any CPU + {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU @@ -276,6 +324,10 @@ Global {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Portable-Release|Any CPU.Build.0 = Release|Any CPU + {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C}.Release|Any CPU.Build.0 = Release|Any CPU + {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Debug|Any CPU.Build.0 = Debug|Any CPU {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU @@ -284,6 +336,10 @@ Global {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Portable-Release|Any CPU.Build.0 = Release|Any CPU + {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5296EAB-C13E-4A88-9532-BD0677D18EC9}.Release|Any CPU.Build.0 = Release|Any CPU + {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -292,6 +348,10 @@ Global {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {90B943AB-3879-4B64-B9FF-1A21297C0F26}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -300,6 +360,10 @@ Global {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {2C062B51-EFD0-4FDC-8F75-3D76161FBCB5}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -308,6 +372,10 @@ Global {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {7DD043EB-5E53-4180-B123-CC3CC5022E34}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -316,6 +384,10 @@ Global {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {25B049BF-66AC-4B7A-B6B1-3DC74DE3951C}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {E631A573-C789-4E13-ABE8-5941A8008DC9}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {E631A573-C789-4E13-ABE8-5941A8008DC9}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {E631A573-C789-4E13-ABE8-5941A8008DC9}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {E631A573-C789-4E13-ABE8-5941A8008DC9}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {E631A573-C789-4E13-ABE8-5941A8008DC9}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -324,6 +396,10 @@ Global {E631A573-C789-4E13-ABE8-5941A8008DC9}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {E631A573-C789-4E13-ABE8-5941A8008DC9}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {E631A573-C789-4E13-ABE8-5941A8008DC9}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {E631A573-C789-4E13-ABE8-5941A8008DC9}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {E631A573-C789-4E13-ABE8-5941A8008DC9}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -332,6 +408,10 @@ Global {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {B3AC3239-0B12-415A-94CE-BFF6DE1A537E}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -340,6 +420,10 @@ Global {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {A29CBB5F-19A8-4E80-8D16-722B02B0CF94}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -348,14 +432,22 @@ Global {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {3BA8DBC9-AF2B-4CE8-A180-803E055B2FEB}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {312B07BC-A830-4289-91B4-C53A2EC37D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {312B07BC-A830-4289-91B4-C53A2EC37D58}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU {312B07BC-A830-4289-91B4-C53A2EC37D58}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU {312B07BC-A830-4289-91B4-C53A2EC37D58}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU {312B07BC-A830-4289-91B4-C53A2EC37D58}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU + {312B07BC-A830-4289-91B4-C53A2EC37D58}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74BE0601-FF65-4B46-8A8B-E670056061C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {74BE0601-FF65-4B46-8A8B-E670056061C4}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU {74BE0601-FF65-4B46-8A8B-E670056061C4}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU {74BE0601-FF65-4B46-8A8B-E670056061C4}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU {74BE0601-FF65-4B46-8A8B-E670056061C4}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU + {74BE0601-FF65-4B46-8A8B-E670056061C4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -364,6 +456,10 @@ Global {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Portable-Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Portable-Release|Any CPU.ActiveCfg = Portable-Release|Any CPU {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Portable-Release|Any CPU.Build.0 = Portable-Release|Any CPU + {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {31AEC9B5-35C9-4FEA-8420-4C34D3FEAAC8}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {DA37E6A9-5D59-45A3-A809-ABA85031C369}.Debug|Any CPU.ActiveCfg = Portable-Debug|Any CPU + {DA37E6A9-5D59-45A3-A809-ABA85031C369}.Debug|Any CPU.Build.0 = Portable-Debug|Any CPU {DA37E6A9-5D59-45A3-A809-ABA85031C369}.Net45-Debug|Any CPU.ActiveCfg = Net45-Debug|Any CPU {DA37E6A9-5D59-45A3-A809-ABA85031C369}.Net45-Debug|Any CPU.Build.0 = Net45-Debug|Any CPU {DA37E6A9-5D59-45A3-A809-ABA85031C369}.Net45-Release|Any CPU.ActiveCfg = Net45-Release|Any CPU @@ -372,14 +468,10 @@ 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 + {DA37E6A9-5D59-45A3-A809-ABA85031C369}.Release|Any CPU.ActiveCfg = Portable-Release|Any CPU + {DA37E6A9-5D59-45A3-A809-ABA85031C369}.Release|Any CPU.Build.0 = Portable-Release|Any CPU + {654344A5-0556-49C7-BFB3-59676D7440D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {654344A5-0556-49C7-BFB3-59676D7440D3}.Debug|Any CPU.Build.0 = Debug|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 @@ -388,6 +480,10 @@ Global {654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU {654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU {654344A5-0556-49C7-BFB3-59676D7440D3}.Portable-Release|Any CPU.Build.0 = Release|Any CPU + {654344A5-0556-49C7-BFB3-59676D7440D3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {654344A5-0556-49C7-BFB3-59676D7440D3}.Release|Any CPU.Build.0 = Release|Any CPU + {1C3B4A33-E045-4C8F-9202-1B651A686567}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C3B4A33-E045-4C8F-9202-1B651A686567}.Debug|Any CPU.Build.0 = Debug|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 @@ -396,6 +492,32 @@ Global {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 + {1C3B4A33-E045-4C8F-9202-1B651A686567}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C3B4A33-E045-4C8F-9202-1B651A686567}.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}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {784D4B45-F12A-4B8F-A86C-35A080814A19}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU + {784D4B45-F12A-4B8F-A86C-35A080814A19}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU + {784D4B45-F12A-4B8F-A86C-35A080814A19}.Net45-Release|Any CPU.Build.0 = Release|Any CPU + {784D4B45-F12A-4B8F-A86C-35A080814A19}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {784D4B45-F12A-4B8F-A86C-35A080814A19}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU + {784D4B45-F12A-4B8F-A86C-35A080814A19}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU + {784D4B45-F12A-4B8F-A86C-35A080814A19}.Portable-Release|Any CPU.Build.0 = Release|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}.Net45-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Net45-Debug|Any CPU.Build.0 = Debug|Any CPU + {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Net45-Release|Any CPU.ActiveCfg = Release|Any CPU + {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Net45-Release|Any CPU.Build.0 = Release|Any CPU + {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Portable-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Portable-Debug|Any CPU.Build.0 = Debug|Any CPU + {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Portable-Release|Any CPU.ActiveCfg = Release|Any CPU + {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC}.Portable-Release|Any CPU.Build.0 = Release|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 @@ -420,8 +542,6 @@ Global {34B82690-0083-4F4C-8ABF-2D2A09304915} = {A9C01442-1E93-4C2D-9182-B61C9F53C3FF} {AFD3F1C4-5C59-4018-B0BB-030E0DA57C5C} = {A9C01442-1E93-4C2D-9182-B61C9F53C3FF} {CB3CA435-07CB-4DF6-A574-4FCB6909D3DD} = {9B87B0F7-B02C-4498-BB03-B6E282F86557} - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4} = {03E75B1D-A443-4A12-B31F-860DB2B45140} - {729D041A-180E-47A4-AB77-6C7CA72F40C3} = {03E75B1D-A443-4A12-B31F-860DB2B45140} {EDDB6367-5C7B-428C-B54C-96BCD90F6E6C} = {9C3EF315-B4C1-4E11-B2FC-31B1530393D9} {D5296EAB-C13E-4A88-9532-BD0677D18EC9} = {9C3EF315-B4C1-4E11-B2FC-31B1530393D9} {90B943AB-3879-4B64-B9FF-1A21297C0F26} = {30F628FD-5739-49E7-B9D9-37EC93F429A9} @@ -440,5 +560,7 @@ Global {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} + {784D4B45-F12A-4B8F-A86C-35A080814A19} = {03E75B1D-A443-4A12-B31F-860DB2B45140} + {43DFEF27-2FD7-4827-A669-DFD2DD1CBBCC} = {03E75B1D-A443-4A12-B31F-860DB2B45140} EndGlobalSection EndGlobal diff --git a/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs b/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs index b45865425959c..4e11a1a94564f 100644 --- a/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs +++ b/AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs @@ -9,7 +9,7 @@ namespace Microsoft.Rest.Generator.Logging /// /// Code generation aggregate exception. /// -#if !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class CodeGenerationException : AggregateException @@ -38,7 +38,7 @@ public CodeGenerationException(string message, Exception innerException) : base( { } -#if !DNXCORE50 +#if !PORTABLE /// /// Instantiates a new instance of the CodeGenerationException class. /// 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 3624fde45de91..cd000e238b54c 100644 --- a/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj +++ b/AutoRest/Generators/AzureResourceSchema/AzureResourceSchema.Tests/AutoRest.Generator.AzureResourceSchema.Tests.csproj @@ -1,5 +1,6 @@  + @@ -12,10 +13,8 @@ Microsoft.Rest.Generator.AzureResourceSchema.Tests AutoRest.Generator.AzureResourceSchema.Tests AutoRest.Generator.AzureResourceSchema.Tests - v4.5.2 + v4.5 512 - - true diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs index 6c254399697c3..4fbbf9753dd07 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AcceptanceTests.cs @@ -70,7 +70,7 @@ public void AzureCustomBaseUriTests() using (var client = new AutoRestParameterizedHostTestClient(new TokenCredentials(Guid.NewGuid().ToString()))) { // small modification to the "host" portion to include the port and the '.' - client.Host = string.Format(CultureInfo.InvariantCulture, "{0}.:{1}", client.Host, Fixture.Port); + client.Host = string.Format(CultureInfo.InvariantCulture, "{0}:{1}", client.Host, Fixture.Port); Assert.Equal(HttpStatusCode.OK, client.Paths.GetEmptyWithHttpMessagesAsync("local").Result.Response.StatusCode); } 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 31b13e6afe8a3..0000000000000 --- 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/AutoRest.Generator.Azure.CSharp.Tests.xproj b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.xproj deleted file mode 100644 index e0c52aa829495..0000000000000 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/AutoRest.Generator.Azure.CSharp.Tests.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 729d041a-180e-47a4-ab77-6c7ca72f40c3 - AutoRest.Generator.Azure.CSharp.Tests - obj\$(MSBuildProjectName) - bin\$(MSBuildProjectName)\ - - - 2.0 - True - - - - - - - \ 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 0000000000000..88289c226476e --- /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/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs index 9842d37c70081..2a54631c9f442 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureBodyDuration/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureBodyDuration.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs index 58d2cd0e7c244..c8518921e398e 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureCompositeModelClient/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsAzureCompositeModelClient.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs index 93d43525cdce5..6c0fbb42ce981 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureParameterGrouping/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureParameterGrouping.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs index ebcce30a4c93f..b9fd0f64fd983 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureReport/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureReport.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/ErrorException.cs index 4ba9b55b334a1..884ecc797e88b 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureResource/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureResource.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/ErrorException.cs index fdd3f42f7e0a8..aa34c08ab823a 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/AzureSpecials/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsAzureSpecials.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs index 9f069157ee6e9..893eab1d6d2f7 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsCustomBaseUri.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/ErrorException.cs b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/ErrorException.cs index 826ec5d3fdbd9..5883ef1e1329c 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/Expected/AcceptanceTests/SubscriptionIdApiVersion/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.Azure.AcceptanceTestsSubscriptionIdApiVersion.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json index 91409339218b2..dfe12d747c247 100644 --- a/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json +++ b/AutoRest/Generators/CSharp/Azure.CSharp.Tests/project.json @@ -1,27 +1,37 @@ { - "version": "1.5.0", - "summary": "Generator.CSharp Tests.", + "version": "2.0.0", "authors": [ "Microsoft" ], - "tags": [ "Microsoft AutoRest ClientRuntime REST" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "commands": { - "test": "xunit.runner.dnx" + + "packOptions": { + "summary": "Generator.CSharp Tests.", + "tags": [ "Microsoft AutoRest ClientRuntime REST" ], + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", }, + + "buildOptions": { + "compile": { + "exclude": [ "CSharpAzureCodeNamingFrameworkTests.*" ], + } + }, + + "testRunner": "xunit", "frameworks": { - "dnxcore50": { - "compilationOptions": { "define": [ "PORTABLE" ] }, - "dependencies": { - "xunit.runner.dnx": "2.1.0-rc1-build204", - "Microsoft.Rest.ClientRuntime": "", - "Microsoft.Rest.ClientRuntime.Azure": "", - "CSharp.Tests": "", - "xunit": "2.1.0" - } + "netcoreapp1.0": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50", "portable-net45+win8"] } }, - "exclude": [ "CSharpAzureCodeNamingFrameworkTests.*" ], + "dependencies": { - "Microsoft.Framework.Logging.Console": "1.0.0-beta8" + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-*" + }, + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "CSharp.Tests": "2.0.0", + "Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)", + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-rc2-build10015" } } diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs b/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs index bdd10a6f30136..f4d91ea4bf753 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/AcceptanceTests.cs @@ -1954,7 +1954,7 @@ public void CustomBaseUriTests() using (var client = new AutoRestParameterizedHostTestClient()) { // small modification to the "host" portion to include the port and the '.' - client.Host = string.Format(CultureInfo.InvariantCulture, "{0}.:{1}", client.Host, Fixture.Port); + client.Host = string.Format(CultureInfo.InvariantCulture, "{0}:{1}", client.Host, Fixture.Port); Assert.Equal(HttpStatusCode.OK, client.Paths.GetEmptyWithHttpMessagesAsync("local").Result.Response.StatusCode); } @@ -1969,7 +1969,7 @@ public void CustomBaseUriMoreOptionsTests() { client.SubscriptionId = "test12"; // small modification to the "host" portion to include the port and the '.' - client.DnsSuffix = string.Format(CultureInfo.InvariantCulture, "{0}.:{1}", "host", Fixture.Port); + client.DnsSuffix = string.Format(CultureInfo.InvariantCulture, "{0}:{1}", "host", Fixture.Port); Assert.Equal(HttpStatusCode.OK, client.Paths.GetEmptyWithHttpMessagesAsync("http://lo", "cal", "key1").Result.Response.StatusCode); } 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 11e8a1170464c..0000000000000 --- 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/AutoRest.Generator.CSharp.Tests.xproj b/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.xproj deleted file mode 100644 index 074eec617457c..0000000000000 --- a/AutoRest/Generators/CSharp/CSharp.Tests/AutoRest.Generator.CSharp.Tests.xproj +++ /dev/null @@ -1,31 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - {7F524559-93F9-4F3F-9E2C-AF41A0C2E6F4} - AutoRest.Generator.CSharp.Tests - obj\$(MSBuildProjectName) - bin\$(MSBuildProjectName)\ - - - 2.0 - True - - - - - - - - - - - - - - - \ 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 0000000000000..c16dbe98a9592 --- /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/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Models/ErrorException.cs index b067ffb59627f..096a94320b521 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyArray/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyArray.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/Models/ErrorException.cs index 15cddb927fb9a..5ed2f7eb9e526 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyBoolean/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyBoolean.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/Models/ErrorException.cs index e84c83b21ce66..27609acb8a3a9 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyByte/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyByte.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/ErrorException.cs index f334842b9b4e7..e82d637189ec0 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyComplex/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyComplex.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Models/ErrorException.cs index 9e379980da3ce..2f9e6a2b9cefe 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDate/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDate.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Models/ErrorException.cs index ceeebe2fe58a6..bcc82cb20e9ac 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTime/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDateTime.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Models/ErrorException.cs index 7dfe1036d053d..7da71e1c3cfeb 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDateTimeRfc1123/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDateTimeRfc1123.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Models/ErrorException.cs index 201f921d77ed9..aaff5df04ebaa 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDictionary/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDictionary.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Models/ErrorException.cs index 231fbad8282ab..6d584b4429187 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyDuration/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyDuration.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Models/ErrorException.cs index 204e3b078d8cb..61b07afa89eba 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFile/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyFile.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFormData/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFormData/Models/ErrorException.cs index 6f3755c59c281..31bc239cb640b 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFormData/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyFormData/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyFormData.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/Models/ErrorException.cs index 5fb0256ac6907..fd595ce8e15f0 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyInteger/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyInteger.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Models/ErrorException.cs index 3dda25b7812af..cc3fb0b9bcdcb 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyNumber/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyNumber.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/Models/ErrorException.cs index 7cc4ee35635b0..d4dd2266c40d2 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/BodyString/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsBodyString.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/Models/ErrorException.cs index a3ca0017a6b8a..2f72efa6e7e9c 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CompositeBoolIntClient/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsCompositeBoolIntClient.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs index 36c220ba33fd6..27a16617a3bf8 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUri/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsCustomBaseUri.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs index e3ab1c0a08abc..b05dfbe6d0f51 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/CustomBaseUriMoreOptions/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsCustomBaseUriMoreOptions.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/ErrorException.cs index c2fac7576e4ab..33fa32c989ed6 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Header/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsHeader.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/ErrorException.cs index 276401c1d7d0a..8230e0b04dbd9 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsHttp.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/MyException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/MyException.cs index c8e557c9ea66d..2b16eca18ba32 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/MyException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Http/Models/MyException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsHttp.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with A information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class MyException : RestException @@ -65,7 +65,7 @@ public MyException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the MyException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/ErrorException.cs index 5d1edcbaa0f1f..11dd520d87e71 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/ModelFlattening/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsModelFlattening.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Report/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Report/Models/ErrorException.cs index 226d74461ba8f..1f52945fee29e 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Report/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Report/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsReport.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/Models/ErrorException.cs index fbdac38d5ed13..5ffc54e299a03 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/RequiredOptional/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsRequiredOptional.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Models/ErrorException.cs index 9c3eea8c70cc8..d74e119828914 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Url/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsUrl.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ErrorException.cs index 1a14ee36a3356..d4233d3177140 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/AcceptanceTests/Validation/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.AcceptanceTestsValidation.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/DateTimeOffset/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/DateTimeOffset/Models/ErrorException.cs index 74a3a68a5d6b6..82df25efe79f0 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/DateTimeOffset/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/DateTimeOffset/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.DateTimeOffset.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Error2Exception.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Error2Exception.cs index 36adb6b18060a..02ba1374392cf 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Error2Exception.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Polymorphic/Models/Error2Exception.cs @@ -12,14 +12,14 @@ namespace Fixtures.MirrorPolymorphic.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error2 information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class Error2Exception : RestException @@ -65,7 +65,7 @@ public Error2Exception(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the Error2Exception class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/ErrorException.cs index e343e02354f7d..d0b8eed0650a4 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Primitives/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.MirrorPrimitives.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/ErrorException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/ErrorException.cs index 7dbb2d5930207..b2d308e0feba4 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/ErrorException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.RecursiveTypes/Models/ErrorException.cs @@ -12,14 +12,14 @@ namespace Fixtures.MirrorRecursiveTypes.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with Error information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorException : RestException @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Sequences/Models/ErrorModelException.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Sequences/Models/ErrorModelException.cs index 4d3757c6887fc..d63ec3bc3a022 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Sequences/Models/ErrorModelException.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Expected/Mirror.Sequences/Models/ErrorModelException.cs @@ -12,14 +12,14 @@ namespace Fixtures.MirrorSequences.Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif /// /// Exception thrown for an invalid response with ErrorModel information. /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class ErrorModelException : RestException @@ -65,7 +65,7 @@ public ErrorModelException(string message, Exception innerException) { } -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the ErrorModelException class. /// diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/Utilities/ServiceController.cs b/AutoRest/Generators/CSharp/CSharp.Tests/Utilities/ServiceController.cs index 3fef567af5101..a35f84fd66e7b 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/Utilities/ServiceController.cs +++ b/AutoRest/Generators/CSharp/CSharp.Tests/Utilities/ServiceController.cs @@ -58,13 +58,13 @@ private static string AcceptanceTestsPath public Action TearDown { get; set; } /// - /// Port number the service is listenig on. + /// Port number the service is listening on. /// public int Port { get; set; } public Uri Uri { - get { return new Uri(string.Format(CultureInfo.InvariantCulture, "http://localhost.:{0}", Port)); } + get { return new Uri(string.Format(CultureInfo.InvariantCulture, "http://localhost:{0}", Port)); } } /// @@ -169,8 +169,8 @@ public void StartServiceProcess() else { throw new InvalidOperationException(string.Format(CultureInfo.CurrentCulture, - "Failed to start {0} {1} .", - npmPath, NpmArgument)); + "Failed to start {0} {1} '{2}'.", + npmPath, NpmArgument, AcceptanceTestsPath)); } } } diff --git a/AutoRest/Generators/CSharp/CSharp.Tests/project.json b/AutoRest/Generators/CSharp/CSharp.Tests/project.json index acd7650d15c48..b3e581cfb007b 100644 --- a/AutoRest/Generators/CSharp/CSharp.Tests/project.json +++ b/AutoRest/Generators/CSharp/CSharp.Tests/project.json @@ -1,32 +1,38 @@ { - "version": "1.5.0", - "summary": "Generator.CSharp Tests.", + "version": "2.0.0", "authors": [ "Microsoft" ], - "tags": [ "Microsoft AutoRest ClientRuntime REST" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "commands": { - "test": "xunit.runner.dnx" + + "packOptions": { + "summary": "Generator.CSharp Tests.", + "tags": [ "Microsoft AutoRest ClientRuntime REST" ], + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", }, + + "buildOptions": { + "compile": { + "exclude": [ "CSharpCodeNamingFrameworkTests.*" ], + } + }, + + "testRunner": "xunit", "frameworks": { - "dnxcore50": { - "compilationOptions": { "define": [ "PORTABLE" ] }, - "dependencies": { - "System.Diagnostics.Tools": "4.0.0", - "System.Net.Http": "4.0.0", - "System.Threading.Tasks": "4.0.10", - "System.Xml.ReaderWriter": "4.0.10", - "Microsoft.CSharp": "4.0.0", - "xunit.runner.dnx": "2.1.0-rc1-build204" - } + "netcoreapp1.0": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50", "portable-net45+win8"] } }, - "exclude": [ "CSharpCodeNamingFrameworkTests.*" ], "dependencies": { - "Microsoft.Rest.ClientRuntime": "", - "System.Runtime.Serialization.Primitives": "4.0.10", - "System.Runtime.Loader": "4.0.0-beta-23409", + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-*" + }, + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0)", + "Microsoft.Extensions.Logging": "1.0.0-rc2-final", + "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final", + "Microsoft.Extensions.Logging.Filter": "1.0.0-rc2-final", "xunit": "2.1.0", - "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final" + "dotnet-test-xunit": "1.0.0-rc2-build10015" } } diff --git a/AutoRest/Generators/CSharp/CSharp/Templates/ExceptionTemplate.cshtml b/AutoRest/Generators/CSharp/CSharp/Templates/ExceptionTemplate.cshtml index 796b41d25d1c9..38e81fe275131 100644 --- a/AutoRest/Generators/CSharp/CSharp/Templates/ExceptionTemplate.cshtml +++ b/AutoRest/Generators/CSharp/CSharp/Templates/ExceptionTemplate.cshtml @@ -9,14 +9,14 @@ namespace @(Settings.Namespace).Models using System; using System.Net.Http; using System.Runtime.Serialization; -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE using System.Security.Permissions; #endif @EmptyLine /// @WrapComment("/// ", "Exception thrown for an invalid response with " + Model.Name + " information.") /// -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE [Serializable] #endif public class @Model.ExceptionTypeDefinitionName : RestException @@ -62,7 +62,7 @@ namespace @(Settings.Namespace).Models { } @EmptyLine -#if !PORTABLE && !DNXCORE50 +#if !PORTABLE /// /// Initializes a new instance of the @Model.ExceptionTypeDefinitionName class. /// diff --git a/AutoRest/Generators/CSharp/global.json b/AutoRest/Generators/CSharp/global.json new file mode 100644 index 0000000000000..db07c2d969bcd --- /dev/null +++ b/AutoRest/Generators/CSharp/global.json @@ -0,0 +1,3 @@ +{ + "projects": [ "../../../ClientRuntimes/CSharp/", "Azure.CSharp.Tests", "CSharp.Tests" ] +} \ No newline at end of file diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurecustombaseuri/AzureCustomBaseUriTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurecustombaseuri/AzureCustomBaseUriTests.java index 876dae8fab2a7..b6007f1d8195e 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurecustombaseuri/AzureCustomBaseUriTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurecustombaseuri/AzureCustomBaseUriTests.java @@ -23,7 +23,7 @@ public static void setup() { // Positive test case @Test public void getEmptyWithValidCustomUri() throws Exception { - client.setHost("host.:3000"); + client.setHost("host:3000"); Assert.assertTrue(client.getPathsOperations().getEmpty("local").getResponse().isSuccess()); } @@ -49,7 +49,7 @@ public void getEmptyWithInvalidCustomUriHostName() throws Exception { Assert.assertTrue(true); } finally { - client.setHost("host.:3000"); + client.setHost("host:3000"); } } diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azureparametergrouping/ParameterGroupingTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azureparametergrouping/ParameterGroupingTests.java index 958cb47558190..9ff05df067532 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azureparametergrouping/ParameterGroupingTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azureparametergrouping/ParameterGroupingTests.java @@ -15,7 +15,7 @@ public class ParameterGroupingTests { @BeforeClass public static void setup() { - client = new AutoRestParameterGroupingTestServiceImpl("http://localhost.:3000", null); + client = new AutoRestParameterGroupingTestServiceImpl("http://localhost:3000", null); } @Test diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/ApiVersionDefaultTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/ApiVersionDefaultTests.java index 09b60454fefa4..13ca2858f3920 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/ApiVersionDefaultTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/ApiVersionDefaultTests.java @@ -10,7 +10,7 @@ public class ApiVersionDefaultTests { @BeforeClass public static void setup() { - client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost.:3000", null); + client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost:3000", null); } @Test diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/ApiVersionLocalTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/ApiVersionLocalTests.java index 23daa68567330..0e400589ca4bc 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/ApiVersionLocalTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/ApiVersionLocalTests.java @@ -10,7 +10,7 @@ public class ApiVersionLocalTests { @BeforeClass public static void setup() { - client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost.:3000", null); + client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost:3000", null); } @Test diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/HeaderOperationsTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/HeaderOperationsTests.java index 38c4ea8d27d8f..a812da5cef95c 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/HeaderOperationsTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/HeaderOperationsTests.java @@ -11,7 +11,7 @@ public class HeaderOperationsTests { @BeforeClass public static void setup() { - client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost.:3000", null); + client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost:3000", null); } @Test diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SkipUrlEncodingTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SkipUrlEncodingTests.java index 27833358f1994..ecc46c3d6ca94 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SkipUrlEncodingTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SkipUrlEncodingTests.java @@ -9,7 +9,7 @@ public class SkipUrlEncodingTests { private static final int OK_STATUS_CODE = 200; private static final int NOT_FOUND_STATUS_CODE = 404; - private static String baseUrl = "http://localhost.:3000"; + private static String baseUrl = "http://localhost:3000"; private static String unencodedPath = "path1/path2/path3"; private static String unencodedQuery = "value1&q2=value2&q3=value3"; diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInCredentialsTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInCredentialsTests.java index f2737de2ad185..efc1c77f7fbd3 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInCredentialsTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInCredentialsTests.java @@ -13,7 +13,7 @@ public class SubscriptionInCredentialsTests { @BeforeClass public static void setup() { - client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost.:3000", new TokenCredentials(null, UUID.randomUUID().toString())); + client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost:3000", new TokenCredentials(null, UUID.randomUUID().toString())); client.setSubscriptionId("1234-5678-9012-3456"); } diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInMethodTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInMethodTests.java index 152b03327f31f..dc7c0834fec0f 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInMethodTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInMethodTests.java @@ -15,7 +15,7 @@ public class SubscriptionInMethodTests { @BeforeClass public static void setup() { - client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost.:3000", new TokenCredentials(null, UUID.randomUUID().toString())); + client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost:3000", new TokenCredentials(null, UUID.randomUUID().toString())); client.setSubscriptionId("1234-5678-9012-3456"); } diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/XMsClientRequestIdTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/XMsClientRequestIdTests.java index 4f2f42c836954..e0d1466a6d865 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/XMsClientRequestIdTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/XMsClientRequestIdTests.java @@ -15,7 +15,7 @@ public class XMsClientRequestIdTests { @BeforeClass public static void setup() { - client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost.:3000", new TokenCredentials(null, UUID.randomUUID().toString())); + client = new AutoRestAzureSpecialParametersTestClientImpl("http://localhost:3000", new TokenCredentials(null, UUID.randomUUID().toString())); client.setSubscriptionId("1234-5678-9012-3456"); } diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/head/HttpSuccessTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/head/HttpSuccessTests.java index 1e9a76c0f41bf..14a5145583958 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/head/HttpSuccessTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/head/HttpSuccessTests.java @@ -9,7 +9,7 @@ public class HttpSuccessTests { @BeforeClass public static void setup() { - client = new AutoRestHeadTestServiceImpl("http://localhost.:3000", null); + client = new AutoRestHeadTestServiceImpl("http://localhost:3000", null); } @Test diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/headexceptions/HeadExceptionTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/headexceptions/HeadExceptionTests.java index b66a8ee8e223d..e99bc8e667b24 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/headexceptions/HeadExceptionTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/headexceptions/HeadExceptionTests.java @@ -9,7 +9,7 @@ public class HeadExceptionTests { @BeforeClass public static void setup() { - client = new AutoRestHeadExceptionTestServiceImpl("http://localhost.:3000", null); + client = new AutoRestHeadExceptionTestServiceImpl("http://localhost:3000", null); } @Test diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LRORetrysTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LRORetrysTests.java index 90b249283dd31..6540a30494385 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LRORetrysTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LRORetrysTests.java @@ -13,7 +13,7 @@ public class LRORetrysTests { @BeforeClass public static void setup() { - client = new AutoRestLongRunningOperationTestServiceImpl("http://localhost.:3000", null); + client = new AutoRestLongRunningOperationTestServiceImpl("http://localhost:3000", null); client.getAzureClient().setLongRunningOperationRetryTimeout(0); } diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROSADsTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROSADsTests.java index c1c75265d9ccc..e74c56ec19d2a 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROSADsTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROSADsTests.java @@ -19,7 +19,7 @@ public class LROSADsTests { @BeforeClass public static void setup() { - client = new AutoRestLongRunningOperationTestServiceImpl("http://localhost.:3000", null); + client = new AutoRestLongRunningOperationTestServiceImpl("http://localhost:3000", null); client.getAzureClient().setLongRunningOperationRetryTimeout(0); } diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROsCustomHeaderTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROsCustomHeaderTests.java index 590b0aab05e2e..c146da0a8dede 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROsCustomHeaderTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROsCustomHeaderTests.java @@ -28,7 +28,7 @@ public static void setup() { customHeaders.put("x-ms-client-request-id", "9C4D50EE-2D56-4CD3-8152-34347DC9F2B0"); customHeaderInterceptor = new CustomHeaderInterceptor().addHeaderMap(customHeaders); - client = new AutoRestLongRunningOperationTestServiceImpl("http://localhost.:3000", null, clientBuilder, new Retrofit.Builder()); + client = new AutoRestLongRunningOperationTestServiceImpl("http://localhost:3000", null, clientBuilder, new Retrofit.Builder()); client.getClientInterceptors().add(customHeaderInterceptor); client.getAzureClient().setLongRunningOperationRetryTimeout(0); client.setLogLevel(HttpLoggingInterceptor.Level.BODY); diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROsTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROsTests.java index aa03f7ed1c435..4991e4af329fe 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROsTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROsTests.java @@ -21,7 +21,7 @@ public class LROsTests { @BeforeClass public static void setup() { - client = new AutoRestLongRunningOperationTestServiceImpl("http://localhost.:3000", null); + client = new AutoRestLongRunningOperationTestServiceImpl("http://localhost:3000", null); client.getAzureClient().setLongRunningOperationRetryTimeout(0); } diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/paging/PagingTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/paging/PagingTests.java index 04581c5950bae..94b16136d7d73 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/paging/PagingTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/paging/PagingTests.java @@ -25,7 +25,7 @@ public class PagingTests { @BeforeClass public static void setup() { - client = new AutoRestPagingTestServiceImpl("http://localhost.:3000", null); + client = new AutoRestPagingTestServiceImpl("http://localhost:3000", null); client.setLogLevel(HttpLoggingInterceptor.Level.BASIC); } diff --git a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/subscriptionidapiversion/GroupTests.java b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/subscriptionidapiversion/GroupTests.java index bca1789e07d5a..a89d7875976b8 100644 --- a/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/subscriptionidapiversion/GroupTests.java +++ b/AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/subscriptionidapiversion/GroupTests.java @@ -12,7 +12,7 @@ public class GroupTests { @BeforeClass public static void setup() { - client = new MicrosoftAzureTestUrlImpl("http://localhost.:3000", null); + client = new MicrosoftAzureTestUrlImpl("http://localhost:3000", null); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyarray/ArrayTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyarray/ArrayTests.java index 03b7e211ba6b3..6880a82163b02 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyarray/ArrayTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyarray/ArrayTests.java @@ -27,7 +27,7 @@ public class ArrayTests { @BeforeClass public static void setup() { - client = new AutoRestSwaggerBATArrayServiceImpl("http://localhost.:3000"); + client = new AutoRestSwaggerBATArrayServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/DictionaryTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/DictionaryTests.java index 89000eeab9bb2..503ad07aa9164 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/DictionaryTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/DictionaryTests.java @@ -13,7 +13,7 @@ public class DictionaryTests { @BeforeClass public static void setup() { - client = new AutoRestComplexTestServiceImpl("http://localhost.:3000"); + client = new AutoRestComplexTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PolymorphismTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PolymorphismTests.java index 687b66f877d8e..4af305dcc2fca 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PolymorphismTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PolymorphismTests.java @@ -19,7 +19,7 @@ public class PolymorphismTests { @BeforeClass public static void setup() { - client = new AutoRestComplexTestServiceImpl("http://localhost.:3000"); + client = new AutoRestComplexTestServiceImpl("http://localhost:3000"); client.setLogLevel(HttpLoggingInterceptor.Level.BODY); } diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PolymorphismrecursiveTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PolymorphismrecursiveTests.java index ba4dfeb6885b6..375ce7dd0d6aa 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PolymorphismrecursiveTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PolymorphismrecursiveTests.java @@ -17,7 +17,7 @@ public class PolymorphismrecursiveTests { @BeforeClass public static void setup() { - client = new AutoRestComplexTestServiceImpl("http://localhost.:3000"); + client = new AutoRestComplexTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PrimitiveTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PrimitiveTests.java index 3bd56fd2e756c..816ffac6e516b 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PrimitiveTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PrimitiveTests.java @@ -25,7 +25,7 @@ public class PrimitiveTests { @BeforeClass public static void setup() { - client = new AutoRestComplexTestServiceImpl("http://localhost.:3000"); + client = new AutoRestComplexTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/ReadonlypropertyTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/ReadonlypropertyTests.java index 7136de3d1301f..a0337208d4415 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/ReadonlypropertyTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/ReadonlypropertyTests.java @@ -9,7 +9,7 @@ public class ReadonlypropertyTests { @BeforeClass public static void setup() { - client = new AutoRestComplexTestServiceImpl("http://localhost.:3000"); + client = new AutoRestComplexTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydate/DateOperationsTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydate/DateOperationsTests.java index 3938219d659a8..403550f0c480f 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydate/DateOperationsTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydate/DateOperationsTests.java @@ -14,7 +14,7 @@ public class DateOperationsTests { @BeforeClass public static void setup() { - client = new AutoRestDateTestServiceImpl("http://localhost.:3000"); + client = new AutoRestDateTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydatetime/DatetimeOperationsTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydatetime/DatetimeOperationsTests.java index 991c0874ca09a..99c3b9aacf740 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydatetime/DatetimeOperationsTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydatetime/DatetimeOperationsTests.java @@ -12,7 +12,7 @@ public class DatetimeOperationsTests { @BeforeClass public static void setup() { - client = new AutoRestDateTimeTestServiceImpl("http://localhost.:3000"); + client = new AutoRestDateTimeTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydatetimerfc1123/DateTimeRfc1123OperationsTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydatetimerfc1123/DateTimeRfc1123OperationsTests.java index 4b7693bf18a78..a3a812301be87 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydatetimerfc1123/DateTimeRfc1123OperationsTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydatetimerfc1123/DateTimeRfc1123OperationsTests.java @@ -13,7 +13,7 @@ public class DateTimeRfc1123OperationsTests { @BeforeClass public static void setup() { - client = new AutoRestRFC1123DateTimeTestServiceImpl("http://localhost.:3000"); + client = new AutoRestRFC1123DateTimeTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydictionary/DictionaryTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydictionary/DictionaryTests.java index 688bd71cfa805..5330fdfb88785 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydictionary/DictionaryTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodydictionary/DictionaryTests.java @@ -24,7 +24,7 @@ public class DictionaryTests { @BeforeClass public static void setup() { - client = new AutoRestSwaggerBATdictionaryServiceImpl("http://localhost.:3000"); + client = new AutoRestSwaggerBATdictionaryServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyduration/DurationOperationsTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyduration/DurationOperationsTests.java index 80c04ddb28a96..9f822e65e8561 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyduration/DurationOperationsTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyduration/DurationOperationsTests.java @@ -11,7 +11,7 @@ public class DurationOperationsTests { @BeforeClass public static void setup() { - client = new AutoRestDurationTestServiceImpl("http://localhost.:3000"); + client = new AutoRestDurationTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyfile/FilesTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyfile/FilesTests.java index 9843874e5b23d..c51730e8f4bba 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyfile/FilesTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyfile/FilesTests.java @@ -17,7 +17,7 @@ public class FilesTests { @BeforeClass public static void setup() { OkHttpClient.Builder builder = new OkHttpClient.Builder().readTimeout(1, TimeUnit.MINUTES); - client = new AutoRestSwaggerBATFileServiceImpl("http://localhost.:3000", builder, new Retrofit.Builder()); + client = new AutoRestSwaggerBATFileServiceImpl("http://localhost:3000", builder, new Retrofit.Builder()); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyformdata/FormdataTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyformdata/FormdataTests.java index c6003c0fdf8e6..b3bed03723cdb 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyformdata/FormdataTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyformdata/FormdataTests.java @@ -12,7 +12,7 @@ public class FormdataTests { @BeforeClass public static void setup() { - client = new AutoRestSwaggerBATFormDataServiceImpl("http://localhost.:3000"); + client = new AutoRestSwaggerBATFormDataServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/custombaseuri/CustomBaseUriTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/custombaseuri/CustomBaseUriTests.java index 2e5ca1f5273db..c21afb1666878 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/custombaseuri/CustomBaseUriTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/custombaseuri/CustomBaseUriTests.java @@ -17,7 +17,7 @@ public static void setup() { // Positive test case @Test public void getEmptyWithValidCustomUri() throws Exception { - client.setHost("host.:3000"); + client.setHost("host:3000"); Assert.assertTrue(client.getPathsOperations().getEmpty("local").getResponse().isSuccess()); } @@ -43,7 +43,7 @@ public void getEmptyWithInvalidCustomUriHostName() throws Exception { Assert.assertTrue(true); } finally { - client.setHost("host.:3000"); + client.setHost("host:3000"); } } diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/header/HeaderOperationsTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/header/HeaderOperationsTests.java index a01af84bccaac..20d444933093e 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/header/HeaderOperationsTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/header/HeaderOperationsTests.java @@ -29,7 +29,7 @@ public class HeaderOperationsTests { @BeforeClass public static void setup() { - client = new AutoRestSwaggerBATHeaderServiceImpl("http://localhost.:3000"); + client = new AutoRestSwaggerBATHeaderServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpRedirectsTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpRedirectsTests.java index 10d602fe9f4f5..273dfe1e932cb 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpRedirectsTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpRedirectsTests.java @@ -19,7 +19,7 @@ public class HttpRedirectsTests { @BeforeClass public static void setup() { - client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost.:3000"); + client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpRetryTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpRetryTests.java index c40e041d518c6..f4ea5b2f4df2c 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpRetryTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpRetryTests.java @@ -17,7 +17,7 @@ public class HttpRetryTests { @BeforeClass public static void setup() { - client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost.:3000"); + client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpServerFailureTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpServerFailureTests.java index 5428f9965ba6f..471f9cc753950 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpServerFailureTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpServerFailureTests.java @@ -10,7 +10,7 @@ public class HttpServerFailureTests { @BeforeClass public static void setup() { - client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost.:3000"); + client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpSuccessTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpSuccessTests.java index 1ecbafd22d175..85e7f08c14d0a 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpSuccessTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/HttpSuccessTests.java @@ -17,7 +17,7 @@ public class HttpSuccessTests { @BeforeClass public static void setup() { - client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost.:3000"); + client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/MultipleResponsesTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/MultipleResponsesTests.java index 2953df062dbbf..589e916f29169 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/MultipleResponsesTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/http/MultipleResponsesTests.java @@ -26,7 +26,7 @@ public class MultipleResponsesTests { @BeforeClass public static void setup() { - client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost.:3000"); + client = new AutoRestHttpInfrastructureTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/modelflattening/ModelFlatteningTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/modelflattening/ModelFlatteningTests.java index 5472617de5b5a..bbead9a816854 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/modelflattening/ModelFlatteningTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/modelflattening/ModelFlatteningTests.java @@ -23,7 +23,7 @@ public class ModelFlatteningTests { @BeforeClass public static void setup() { - client = new AutoRestResourceFlatteningTestServiceImpl("http://localhost.:3000"); + client = new AutoRestResourceFlatteningTestServiceImpl("http://localhost:3000"); client.setLogLevel(HttpLoggingInterceptor.Level.BODY); } diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/requiredoptional/ExplicitTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/requiredoptional/ExplicitTests.java index 35b7aa756ff5f..e2c061f50d924 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/requiredoptional/ExplicitTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/requiredoptional/ExplicitTests.java @@ -18,7 +18,7 @@ public class ExplicitTests { @BeforeClass public static void setup() { - client = new AutoRestRequiredOptionalTestServiceImpl("http://localhost.:3000"); + client = new AutoRestRequiredOptionalTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/requiredoptional/ImplicitTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/requiredoptional/ImplicitTests.java index f51fe720ed16a..ec3f53914001d 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/requiredoptional/ImplicitTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/requiredoptional/ImplicitTests.java @@ -11,7 +11,7 @@ public class ImplicitTests { @BeforeClass public static void setup() { - client = new AutoRestRequiredOptionalTestServiceImpl("http://localhost.:3000"); + client = new AutoRestRequiredOptionalTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/PathItemsTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/PathItemsTests.java index f615f804726b8..971476f32794e 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/PathItemsTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/PathItemsTests.java @@ -8,7 +8,7 @@ public class PathItemsTests { @BeforeClass public static void setup() { - client = new AutoRestUrlTestServiceImpl("http://localhost.:3000"); + client = new AutoRestUrlTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/PathsTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/PathsTests.java index 4aa614e9bc02b..07d6abe3dcb20 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/PathsTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/PathsTests.java @@ -11,7 +11,7 @@ public class PathsTests { @BeforeClass public static void setup() { - client = new AutoRestUrlTestServiceImpl("http://localhost.:3000"); + client = new AutoRestUrlTestServiceImpl("http://localhost:3000"); } @Test diff --git a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/QueriesTests.java b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/QueriesTests.java index a8d1b48161701..26bbc9fc3763f 100644 --- a/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/QueriesTests.java +++ b/AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/QueriesTests.java @@ -16,7 +16,7 @@ public class QueriesTests { @BeforeClass public static void setup() { - client = new AutoRestUrlTestServiceImpl("http://localhost.:3000"); + client = new AutoRestUrlTestServiceImpl("http://localhost:3000"); client.setLogLevel(HttpLoggingInterceptor.Level.HEADERS); } diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/AcceptanceTests/lro.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/AcceptanceTests/lro.js index 59c632871cca2..1f31c354a1907 100644 --- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/AcceptanceTests/lro.js +++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/AcceptanceTests/lro.js @@ -17,7 +17,7 @@ var dummyToken = 'dummy12321343423'; var credentials = new msRestAzure.TokenCredentials(dummyToken); var clientOptions = {}; -var baseUri = 'http://localhost.:3000'; +var baseUri = 'http://localhost:3000'; describe('nodejs', function () { diff --git a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/custom_base_uri_tests.py b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/custom_base_uri_tests.py index d1a49930ec386..91f326667558c 100644 --- a/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/custom_base_uri_tests.py +++ b/AutoRest/Generators/Python/Python.Tests/AcceptanceTests/custom_base_uri_tests.py @@ -73,7 +73,7 @@ def test_custom_base_uri_negative(self): client.paths.get_empty("local") def test_custom_base_uri_more_optiopns(self): - client = AutoRestParameterizedCustomHostTestClient("test12", "host.:3000") + client = AutoRestParameterizedCustomHostTestClient("test12", "host:3000") client.paths.get_empty("http://lo", "cal", "key1") if __name__ == '__main__': diff --git a/AutoRest/TestServer/server/package.json b/AutoRest/TestServer/server/package.json index 371aa0278cc11..dbfcb1e10fe65 100644 --- a/AutoRest/TestServer/server/package.json +++ b/AutoRest/TestServer/server/package.json @@ -6,14 +6,14 @@ "start": "node ./startup/www" }, "dependencies": { - "body-parser": "~1.12.0", - "cookie-parser": "~1.3.4", + "body-parser": "~1.15.1", + "cookie-parser": "~1.4.1", "busboy": "*", - "debug": "~2.1.1", - "express": "~4.12.2", - "jade": "~1.9.2", - "morgan": "~1.5.1", - "serve-favicon": "~2.2.0", + "debug": "~2.2.0", + "express": "~4.13.4", + "jade": "~1.11.0", + "morgan": "~1.7.0", + "serve-favicon": "~2.3.0", "underscore": "*", "morgan": "1.6.1" } diff --git a/AutoRest/TestServer/server/routes/lros.js b/AutoRest/TestServer/server/routes/lros.js index ca11fa50082be..84300f3be69a0 100644 --- a/AutoRest/TestServer/server/routes/lros.js +++ b/AutoRest/TestServer/server/routes/lros.js @@ -58,7 +58,7 @@ var lros = function (coverage) { coverage['LROPut202Retry200'] = 0; router.put('/put/202/retry/200', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/put/202/retry/operationResults/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/put/202/retry/operationResults/200'; var headers = { 'Location': pollingUri }; @@ -146,7 +146,7 @@ var lros = function (coverage) { var scenario = getLROAsyncScenarioName("putasync", retry, finalState); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/putasync/' + retry + '/' + finalState.toLowerCase() + '/operationResults/200/'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/putasync/' + retry + '/' + finalState.toLowerCase() + '/operationResults/200/'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -183,7 +183,7 @@ var lros = function (coverage) { var scenario = getLROAsyncScenarioName(operation, retry, finalState); console.log('In scenario: ' + scenario + '\n'); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/' + operation + '/' + retry + '/' + finalState.toLowerCase() + '/operationResults/' + code; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/' + operation + '/' + retry + '/' + finalState.toLowerCase() + '/operationResults/' + code; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -206,7 +206,7 @@ var lros = function (coverage) { coverage['LROPutNoHeaderInRetry'] = 0; router.put('/put/noheader/202/200', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/put/noheader/operationresults'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/put/noheader/operationresults'; var headers = { 'Location': pollingUri }; @@ -228,7 +228,7 @@ var lros = function (coverage) { coverage['LROPutAsyncNoHeaderInRetry'] = 0; router.put('/putasync/noheader/201/200', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/putasync/noheader/operationresults/123'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/putasync/noheader/operationresults/123'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': 'somethingBadWhichShouldNotBeUsed' @@ -255,7 +255,7 @@ var lros = function (coverage) { coverage['LRODeleteNoHeaderInRetry'] = 0; router.delete('/delete/noheader', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/delete/noheader/operationresults/123'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/delete/noheader/operationresults/123'; var headers = { 'Location': pollingUri }; @@ -277,7 +277,7 @@ var lros = function (coverage) { coverage['LRODeleteAsyncNoHeaderInRetry'] = 0; router.delete('/deleteasync/noheader/202/204', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/deleteasync/noheader/operationresults/123'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/deleteasync/noheader/operationresults/123'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': 'somethingBadWhichShouldNotBeUsed' @@ -300,7 +300,7 @@ var lros = function (coverage) { coverage['LROPutSubResourceInRetry'] = 0; router.put('/putsubresource/202/200', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/putsubresource/operationresults'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/putsubresource/operationresults'; var headers = { 'Location': pollingUri }; @@ -322,7 +322,7 @@ var lros = function (coverage) { coverage['LROPutSubResourceAsyncInRetry'] = 0; router.put('/putsubresourceasync/202/200', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/putsubresourceasync/operationresults/123'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/putsubresourceasync/operationresults/123'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': 'somethingBadWhichShouldNotBeUsed' @@ -349,7 +349,7 @@ var lros = function (coverage) { coverage['LROPutNonResourceInRetry'] = 0; router.put('/putnonresource/202/200', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/putnonresource/operationresults'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/putnonresource/operationresults'; var headers = { 'Location': pollingUri }; @@ -371,7 +371,7 @@ var lros = function (coverage) { coverage['LROPutNonResourceAsyncInRetry'] = 0; router.put('/putnonresourceasync/202/200', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/putnonresourceasync/operationresults/123'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/putnonresourceasync/operationresults/123'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': 'somethingBadWhichShouldNotBeUsed' @@ -419,7 +419,7 @@ var lros = function (coverage) { var finalCode = JSON.parse(req.params.finalCode); var scenario = getLRODeleteProvisioningScenarioName(initialCode, initialState, finalCode, finalState); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/delete/provisioning/' + initialCode + '/' + initialState.toLowerCase() + '/' + finalCode + '/' + finalState.toLowerCase(); + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/delete/provisioning/' + initialCode + '/' + initialState.toLowerCase() + '/' + finalCode + '/' + finalState.toLowerCase(); var headers = { 'Location': pollingUri, 'Retry-After': 0 @@ -469,7 +469,7 @@ var lros = function (coverage) { var finalCode = JSON.parse(req.params.finalCode); var scenario = getLRODeleteScenarioName(initialCode, retry, finalCode); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/delete/' + initialCode + '/' + retry + '/' + finalCode; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/delete/' + initialCode + '/' + retry + '/' + finalCode; var headers = { 'Location': pollingUri }; @@ -505,7 +505,7 @@ var lros = function (coverage) { var scenario = getLROAsyncScenarioName("deleteasync", retry, finalState); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/deleteasync/' + retry + '/' + finalState.toLowerCase() + '/operationResults/200/'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/deleteasync/' + retry + '/' + finalState.toLowerCase() + '/operationResults/200/'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -530,7 +530,7 @@ var lros = function (coverage) { var scenario = getLROAsyncScenarioName(operation, retry, finalState); console.log('In scenario: ' + scenario + '\n'); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/' + operation + '/' + retry + '/' + finalState.toLowerCase() + '/operationResults/' + code; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/' + operation + '/' + retry + '/' + finalState.toLowerCase() + '/operationResults/' + code; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -568,7 +568,7 @@ var lros = function (coverage) { var finalCode = JSON.parse(req.params.finalCode); var scenario = getLROPostScenarioName(initialCode, retry, finalCode); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/post/' + initialCode + '/' + retry + '/' + finalCode; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/post/' + initialCode + '/' + retry + '/' + finalCode; var headers = { 'Location': pollingUri }; @@ -588,7 +588,7 @@ var lros = function (coverage) { var finalCode = JSON.parse(req.params.finalCode); var scenario = getLROPostScenarioName(initialCode, retry, finalCode); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/post/newuri/' + initialCode + '/' + retry + '/' + finalCode; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/post/newuri/' + initialCode + '/' + retry + '/' + finalCode; var headers = { 'Location': pollingUri }; @@ -621,7 +621,7 @@ var lros = function (coverage) { coverage['LROPost200'] = 0; router.post('/post/payload/200', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/post/payload/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/post/payload/200'; var headers = { 'Location': pollingUri, 'Retry-After' : 0 @@ -646,7 +646,7 @@ var lros = function (coverage) { var scenario = getLROAsyncScenarioName("postasync", retry, finalState); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/postasync/' + retry + '/' + finalState.toLowerCase() + '/operationResults/200/'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/postasync/' + retry + '/' + finalState.toLowerCase() + '/operationResults/200/'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -671,7 +671,7 @@ var lros = function (coverage) { var scenario = getLROAsyncScenarioName(operation, retry, finalState); console.log('In scenario: ' + scenario + '\n'); if (scenario) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/' + operation + '/' + retry + '/' + finalState.toLowerCase() + '/operationResults/' + code; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/' + operation + '/' + retry + '/' + finalState.toLowerCase() + '/operationResults/' + code; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -736,7 +736,7 @@ var lros = function (coverage) { coverage['LRORetryErrorPutAsyncSucceededPolling'] = 0; router.put('/retryerror/putasync/retry/succeeded', function (req, res, next) { var scenario = 'LRORetryErrorPutAsyncSucceeded'; - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/retryerror/putasync/retry/succeeded/operationResults/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/retryerror/putasync/retry/succeeded/operationResults/200'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -782,7 +782,7 @@ var lros = function (coverage) { addScenarioCookie(res, scenario); res.status(500).end(); } else { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/retryerror/delete/provisioning/202/accepted/200/succeeded'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/retryerror/delete/provisioning/202/accepted/200/succeeded'; var headers = { 'Location': pollingUri }; @@ -811,7 +811,7 @@ var lros = function (coverage) { addScenarioCookie(res, scenario); res.status(500).end(); } else { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/retryerror/delete/202/retry/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/retryerror/delete/202/retry/200'; var headers = { 'Location': pollingUri }; @@ -840,7 +840,7 @@ var lros = function (coverage) { addScenarioCookie(res, scenario); res.status(500).end(); } else { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/retryerror/deleteasync/retry/succeeded/operationResults/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/retryerror/deleteasync/retry/succeeded/operationResults/200'; var headers = { 'Location': '/foo', 'Azure-AsyncOperation': pollingUri, @@ -870,7 +870,7 @@ var lros = function (coverage) { addScenarioCookie(res, scenario); res.status(500).end(); } else { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/retryerror/post/202/retry/200/operationResults'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/retryerror/post/202/retry/200/operationResults'; var headers = { 'Location': pollingUri }; @@ -899,7 +899,7 @@ var lros = function (coverage) { addScenarioCookie(res, scenario); res.status(500).end(); } else { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/retryerror/postasync/retry/succeeded/operationResults/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/retryerror/postasync/retry/succeeded/operationResults/200'; var headers = { 'Location': '/foo', 'Azure-AsyncOperation': pollingUri, @@ -953,7 +953,7 @@ var lros = function (coverage) { coverage['LRONonRetryPutAsyncRetry400'] = 0; router.put('/nonretryerror/putasync/retry/400', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/nonretryerror/putasync/retry/failed/operationResults/400'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/nonretryerror/putasync/retry/failed/operationResults/400'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -975,7 +975,7 @@ var lros = function (coverage) { coverage['LRONonRetryDelete202Retry400'] = 0; router.delete('/nonretryerror/delete/202/retry/400', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/nonretryerror/delete/202/retry/400'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/nonretryerror/delete/202/retry/400'; var headers = { 'Location': pollingUri, 'Retry-After': 0 @@ -990,7 +990,7 @@ var lros = function (coverage) { coverage['LRONonRetryDeleteAsyncRetry400'] = 0; router.delete('/nonretryerror/deleteasync/retry/400', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/nonretryerror/deleteasync/retry/failed/operationResults/400'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/nonretryerror/deleteasync/retry/failed/operationResults/400'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -1012,7 +1012,7 @@ var lros = function (coverage) { coverage['LRONonRetryPost202Retry400'] = 0; router.post('/nonretryerror/post/202/retry/400', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/nonretryerror/post/202/retry/400'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/nonretryerror/post/202/retry/400'; var headers = { 'Location': pollingUri, 'Retry-After': 0 @@ -1027,7 +1027,7 @@ var lros = function (coverage) { coverage['LRONonRetryPostAsyncRetry400'] = 0; router.post('/nonretryerror/postasync/retry/400', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/nonretryerror/postasync/retry/failed/operationResults/400'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/nonretryerror/postasync/retry/failed/operationResults/400'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -1054,7 +1054,7 @@ var lros = function (coverage) { coverage['LROErrorPutAsyncNoPollingStatus'] = 0; router.put('/error/putasync/retry/nostatus', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/error/putasync/retry/failed/operationResults/nostatus'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/error/putasync/retry/failed/operationResults/nostatus'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -1074,7 +1074,7 @@ var lros = function (coverage) { coverage['LROErrorPutAsyncNoPollingStatusPayload'] = 0; router.put('/error/putasync/retry/nostatuspayload', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/error/putasync/retry/failed/operationResults/nostatuspayload'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/error/putasync/retry/failed/operationResults/nostatuspayload'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -1116,7 +1116,7 @@ var lros = function (coverage) { coverage['LROErrorPutAsyncInvalidJsonPolling'] = 0; router.put('/error/putasync/retry/invalidjsonpolling', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/error/putasync/retry/failed/operationResults/invalidjsonpolling'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/error/putasync/retry/failed/operationResults/invalidjsonpolling'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -1149,7 +1149,7 @@ var lros = function (coverage) { coverage['LROErrorDeleteAsyncNoPollingStatus'] = 0; router.delete('/error/deleteasync/retry/nostatus', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/error/deleteasync/retry/failed/operationResults/nostatus'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/error/deleteasync/retry/failed/operationResults/nostatus'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -1177,7 +1177,7 @@ var lros = function (coverage) { coverage['LROErrorDeleteAsyncInvalidJsonPolling'] = 0; router.delete('/error/deleteasync/retry/invalidjsonpolling', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/error/deleteasync/retry/failed/operationResults/invalidjsonpolling'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/error/deleteasync/retry/failed/operationResults/invalidjsonpolling'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -1210,7 +1210,7 @@ var lros = function (coverage) { coverage['LROErrorPostAsyncNoPollingPayload'] = 0; router.post('/error/postasync/retry/nopayload', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/error/postasync/retry/failed/operationResults/nopayload'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/error/postasync/retry/failed/operationResults/nopayload'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -1238,7 +1238,7 @@ var lros = function (coverage) { coverage['LROErrorPostAsyncInvalidJsonPolling'] = 0; router.post('/error/postasync/retry/invalidjsonpolling', function (req, res, next) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/error/postasync/retry/failed/operationResults/invalidjsonpolling'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/error/postasync/retry/failed/operationResults/invalidjsonpolling'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri, @@ -1255,7 +1255,7 @@ var lros = function (coverage) { router.put('/customheader/putasync/retry/succeeded', function (req, res, next) { var header = req.get("x-ms-client-request-id"); if (header && header.toLowerCase() === "9C4D50EE-2D56-4CD3-8152-34347DC9F2B0".toLowerCase()) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/customheader/putasync/retry/succeeded/operationResults/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/customheader/putasync/retry/succeeded/operationResults/200'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -1281,7 +1281,7 @@ var lros = function (coverage) { var header = req.get("x-ms-client-request-id"); var scenario = 'CustomHeaderPutAsyncSucceded'; if (header && header.toLowerCase() === "9C4D50EE-2D56-4CD3-8152-34347DC9F2B0".toLowerCase()) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/customheader/putasync/retry/succeeded/operationResults/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/customheader/putasync/retry/succeeded/operationResults/200'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -1303,7 +1303,7 @@ var lros = function (coverage) { router.post('/customheader/postasync/retry/succeeded', function (req, res, next) { var header = req.get("x-ms-client-request-id"); if (header && header.toLowerCase() === "9C4D50EE-2D56-4CD3-8152-34347DC9F2B0".toLowerCase()) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/customheader/postasync/retry/succeeded/operationResults/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/customheader/postasync/retry/succeeded/operationResults/200'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -1319,7 +1319,7 @@ var lros = function (coverage) { var header = req.get("x-ms-client-request-id"); var scenario = 'CustomHeaderPostAsyncSucceded'; if (header && header.toLowerCase() === "9C4D50EE-2D56-4CD3-8152-34347DC9F2B0".toLowerCase()) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/customheader/postasync/retry/succeeded/operationResults/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/customheader/postasync/retry/succeeded/operationResults/200'; var headers = { 'Azure-AsyncOperation': pollingUri, 'Location': pollingUri @@ -1364,7 +1364,7 @@ var lros = function (coverage) { var scenario = 'CustomHeaderPostSucceeded'; var header = req.get("x-ms-client-request-id"); if (header && header.toLowerCase() === "9C4D50EE-2D56-4CD3-8152-34347DC9F2B0".toLowerCase()) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/customheader/post/202/retry/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/customheader/post/202/retry/200'; var headers = { 'Location': pollingUri }; @@ -1379,7 +1379,7 @@ var lros = function (coverage) { var scenario = 'CustomHeaderPostSucceeded'; var header = req.get("x-ms-client-request-id"); if (header && header.toLowerCase() === "9C4D50EE-2D56-4CD3-8152-34347DC9F2B0".toLowerCase()) { - var pollingUri = 'http://localhost.:' + utils.getPort() + '/lro/customheader/post/newuri/202/retry/200'; + var pollingUri = 'http://localhost:' + utils.getPort() + '/lro/customheader/post/newuri/202/retry/200'; var headers = { 'Location': pollingUri }; diff --git a/AutoRest/TestServer/server/routes/paging.js b/AutoRest/TestServer/server/routes/paging.js index dc435ecfb21f8..953fbf0fc1ff3 100644 --- a/AutoRest/TestServer/server/routes/paging.js +++ b/AutoRest/TestServer/server/routes/paging.js @@ -46,12 +46,12 @@ var paging = function(coverage) { router.get('/multiple', function(req, res, next) { coverage["PagingMultiple"]++; - res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink":"' + 'http://localhost.:' + utils.getPort() + '/paging/multiple/page/2" }') + res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink":"' + 'http://localhost:' + utils.getPort() + '/paging/multiple/page/2" }') }); router.get('/multiple/page/:pagenumber', function(req, res, next) { if (req.params.pagenumber < 10) { - res.status(200).end('{ "values": [ {"properties":{"id" : ' + req.params.pagenumber + ', "name": "product"}} ], "nextLink": "' + 'http://localhost.:' + utils.getPort() + '/paging/multiple/page/' + (++req.params.pagenumber) + '"}'); + res.status(200).end('{ "values": [ {"properties":{"id" : ' + req.params.pagenumber + ', "name": "product"}} ], "nextLink": "' + 'http://localhost:' + utils.getPort() + '/paging/multiple/page/' + (++req.params.pagenumber) + '"}'); } else { res.status(200).end('{"values": [ {"properties":{"id" : ' + req.params.pagenumber + ', "name": "product"}} ]}'); } @@ -60,12 +60,12 @@ var paging = function(coverage) { router.get('/multiple/withpath/:offset', function(req, res, next) { coverage["PagingMultiplePath"]++; - res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink":"' + 'http://localhost.:' + utils.getPort() + '/paging/multiple/withpath/page/' + req.params.offset + '/2" }'); + res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink":"' + 'http://localhost:' + utils.getPort() + '/paging/multiple/withpath/page/' + req.params.offset + '/2" }'); }); router.get('/multiple/withpath/page/:offset/:pagenumber', function(req, res, next) { if (req.params.pagenumber < 10) { - res.status(200).end('{ "values": [ {"properties":{"id" : ' + (parseInt(req.params.pagenumber) + parseInt(req.params.offset)) + ', "name": "product"}} ], "nextLink": "' + 'http://localhost.:' + utils.getPort() + '/paging/multiple/withpath/page/' + req.params.offset + "/" + (++req.params.pagenumber) + '"}'); + res.status(200).end('{ "values": [ {"properties":{"id" : ' + (parseInt(req.params.pagenumber) + parseInt(req.params.offset)) + ', "name": "product"}} ], "nextLink": "' + 'http://localhost:' + utils.getPort() + '/paging/multiple/withpath/page/' + req.params.offset + "/" + (++req.params.pagenumber) + '"}'); } else { res.status(200).end('{"values": [ {"properties":{"id" : ' + (parseInt(req.params.pagenumber) + parseInt(req.params.offset)) + ', "name": "product"}} ]}'); } @@ -79,12 +79,12 @@ var paging = function(coverage) { } else { coverage[scenario]++; removeScenarioCookie(res); - res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink": "' + 'http://localhost.:' + utils.getPort() + '/paging/multiple/page/2" }') + res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink": "' + 'http://localhost:' + utils.getPort() + '/paging/multiple/page/2" }') } }); router.get('/multiple/retrysecond', function(req, res, next) { - res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink": "' + 'http://localhost.:' + utils.getPort() + '/paging/multiple/retrysecond/page/2" }') + res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink": "' + 'http://localhost:' + utils.getPort() + '/paging/multiple/retrysecond/page/2" }') }); router.get('/multiple/retrysecond/page/:pagenumber', function(req, res, next) { @@ -96,10 +96,10 @@ var paging = function(coverage) { } else { coverage[scenario]++; removeScenarioCookie(res); - res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink": "' + 'http://localhost.:' + utils.getPort() + '/paging/multiple/retrysecond/page/3" }') + res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink": "' + 'http://localhost:' + utils.getPort() + '/paging/multiple/retrysecond/page/3" }') } } else if (req.params.pagenumber < 10) { - res.status(200).end('{ "values": [ {"properties":{"id" : ' + req.params.pagenumber + ', "name": "product"}} ], "nextLink": "' + 'http://localhost.:' + utils.getPort() + '/paging/multiple/retrysecond/page/' + (++req.params.pagenumber) + '"}'); + res.status(200).end('{ "values": [ {"properties":{"id" : ' + req.params.pagenumber + ', "name": "product"}} ], "nextLink": "' + 'http://localhost:' + utils.getPort() + '/paging/multiple/retrysecond/page/' + (++req.params.pagenumber) + '"}'); } else { res.status(200).end('{"values": [ {"properties":{"id" : ' + req.params.pagenumber + ', "name": "product"}} ]}'); } @@ -113,7 +113,7 @@ var paging = function(coverage) { router.get('/multiple/failure', function(req, res, next) { coverage["PagingMultipleFailure"]++; - res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink": "' + 'http://localhost.:' + utils.getPort() + '/paging/multiple/failure/page/2" }') + res.status(200).end('{ "values" : [ {"properties":{"id": 1, "name": "Product" }}], "nextLink": "' + 'http://localhost:' + utils.getPort() + '/paging/multiple/failure/page/2" }') }); router.get('/multiple/failure/page/:pagenumber', function(req, res, next) { diff --git a/ClientRuntime.sln b/ClientRuntime.sln index 957611df8d7bc..263c4723b4ad8 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\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\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\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\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\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\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\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\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.Authentication/ClientRuntime.Azure.Authentication.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj similarity index 73% rename from ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/ClientRuntime.Azure.Authentication.xproj rename to ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj index de38a4855c8bd..fc908496abbb4 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/ClientRuntime.Azure.Authentication.xproj +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/Microsoft.Rest.ClientRuntime.Azure.Authentication.xproj @@ -4,18 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + 6319205d-bbfc-4150-beae-31b1c9b911dd Microsoft.Rest.ClientRuntime.Azure.Authentication - obj\$(MSBuildProjectName) - bin + .\obj + .\bin\ + 2.0 True - + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/UserTokenProvider.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/UserTokenProvider.cs index cb63d7e761bc4..dd743ac63c87f 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/UserTokenProvider.cs +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/UserTokenProvider.cs @@ -62,7 +62,7 @@ public UserTokenProvider(AuthenticationContext context, string clientId, Uri tok this._tokenAudience = tokenAudience.ToString(); this._userid = userId; } -// Interactive authentication is not implemented for Dnx. +// Interactive authentication is not implemented for CoreCLR. #if !PORTABLE /// /// Log in to Azure active directory common tenant with user account and authentication provided by the user. Authentication is automatically scoped to the default azure management endpoint. diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json index bf9cb29413457..bee815a029b37 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Authentication/project.json @@ -1,34 +1,47 @@ { - "version": "2.0.1-preview", + "version": "3.1.0-preview", "title": "Authentication for Azure Management Clients", "description": "Provides ADAL based authentication for Azure management client libraries \nSupported Platforms:\n - Portable Class Libraries\n - .NET Framework 4.5\n - Windows 8\n - Windows Phone 8.1\n - DotNet Core", "authors": [ "Microsoft" ], - "tags": [ "Microsoft AutoRest ClientRuntime REST adal" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", "copyright": "Copyright (c) Microsoft Corporation", - "requireLicenseAcceptance": true, - "compilationOptions": { + "packOptions": { + "summary": "Client infrastructure for Azure client library ADAL based authentication.", + "iconUrl": "http://go.microsoft.com/fwlink/?LinkID=288890", + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", + "tags": [ "Microsoft AutoRest ClientRuntime REST adal" ], + "requireLicenseAcceptance": true, + }, + + "buildOptions": { "delaySign": true, + "publicSign": false, "keyFile": "../../../Tools/MSSharedLibKey.snk" }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[2.1.0,3.0)" + "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0)" }, "frameworks": { - "dnxcore50": { - "compilationOptions": { "define": [ "PORTABLE" ] }, + "net45": { + "dependencies": { + "Microsoft.IdentityModel.Clients.ActiveDirectory": "2.26.305102204" + } + }, + "netstandard1.1": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50", "portable-net45+win8"], "dependencies": { - "Microsoft.Cci": "4.0.0-beta-23409", "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha" } }, - "net45": { + "netstandard1.5": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50"], "dependencies": { - "Microsoft.IdentityModel.Clients.ActiveDirectory": "[2.18.206251556]" + "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.6.212041202-alpha" } } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ActiveDirectoryCredentialsTest.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ActiveDirectoryCredentialsTest.cs index d5940089c7c5a..affc4715af444 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ActiveDirectoryCredentialsTest.cs +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ActiveDirectoryCredentialsTest.cs @@ -4,7 +4,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Configuration; using System.Net; using System.Net.Http; using System.Reflection; @@ -14,6 +13,9 @@ using Microsoft.Rest.Azure.Authentication.Internal; using Xunit; using Xunit.Abstractions; +#if !PORTABLE +using System.Configuration; +#endif namespace Microsoft.Rest.ClientRuntime.Azure.Test { diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ClientRuntime.Azure.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj similarity index 69% rename from ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ClientRuntime.Azure.Tests.xproj rename to ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj index 3950742baf12a..41757eecceba3 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/ClientRuntime.Azure.Tests.xproj +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/Microsoft.Rest.ClientRuntime.Azure.Tests.xproj @@ -4,20 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + 3b2346e5-5d1f-4b0a-aeee-f3afb9583a72 Microsoft.Rest.ClientRuntime.Azure.Tests - obj\$(MSBuildProjectName) - bin\$(MSBuildProjectName)\ + .\obj + .\bin\ 2.0 - True - + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json index 81e7a5277c11a..3a4bd75d7e94e 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure.Tests/project.json @@ -1,29 +1,30 @@ { - "version": "1.4.2-preview", - "summary": "ClientRuntime Tests.", + "version": "2.0.0-preview", "authors": [ "Microsoft" ], - "tags": [ "Microsoft AutoRest ClientRuntime REST" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "commands": { - "test": "xunit.runner.dnx" + + "packOptions": { + "summary": "ClientRuntime Tests.", + "tags": [ "Microsoft AutoRest ClientRuntime REST" ], + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", }, + + "testRunner": "xunit", "frameworks": { - "dnxcore50": { - "compilationOptions": { "define": [ "PORTABLE" ] }, - "dependencies": { - "System.Diagnostics.Tools": "4.0.0", - "System.Net.Http": "4.0.0", - "System.Threading.Tasks": "4.0.10", - "System.Xml.ReaderWriter": "4.0.10", - "Microsoft.CSharp": "4.0.0", - "xunit.runner.dnx": "2.1.0-rc1-build198" - } + "netcoreapp1.0": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50", "portable-net45+win8"] } }, "dependencies": { - "Microsoft.Rest.ClientRuntime.Azure": "", - "Microsoft.Rest.ClientRuntime.Azure.Authentication": "", - "xunit": "2.1.0" + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-*" + }, + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)", + "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.1.0-preview,4.0.0)", + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-rc2-build10015" } } 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 84b02182047b1..0000000000000 --- 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/Microsoft.Rest.ClientRuntime.Azure.xproj similarity index 73% rename from ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/ClientRuntime.Azure.xproj rename to ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/Microsoft.Rest.ClientRuntime.Azure.xproj index ece57448cc4ba..7d117eebd4a27 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/ClientRuntime.Azure.xproj +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/Microsoft.Rest.ClientRuntime.Azure.xproj @@ -4,18 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + {d5296eab-c13e-4a88-9532-bd0677d18ec9} Microsoft.Rest.ClientRuntime.Azure - obj\$(Configuration) - bin + .\obj + .\bin\ + 2.0 True - + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json index 6a24bd8b0ca07..932fed5b46890 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Azure/project.json @@ -1,24 +1,29 @@ { - "version": "3.2.0", + "version": "4.1.0", "copyright": "Copyright (c) Microsoft Corporation", - "iconUrl": "http://go.microsoft.com/fwlink/?LinkID=288890", "title": "Client Runtime for Microsoft Azure Libraries", - "summary": "Client infrastructure for Azure client libraries.", "description": "Provides common error handling, tracing, and HTTP/REST-based pipeline manipulation. \nSupported Platforms:\n - Portable Class Libraries\n - .NET Framework 4.5\n - Windows 8\n - Windows Phone 8.1\n - DotNet Core", "authors": [ "Microsoft" ], - "tags": [ "Microsoft Azure AutoRest ClientRuntime REST azureofficial" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "requireLicenseAcceptance": true, - "compilationOptions": { + "packOptions": { + "summary": "Client infrastructure for Azure client libraries.", + "iconUrl": "http://go.microsoft.com/fwlink/?LinkID=288890", + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", + "tags": [ "Microsoft Azure AutoRest ClientRuntime REST azureofficial" ], + "requireLicenseAcceptance": true, + }, + + "buildOptions": { "delaySign": true, + "publicSign": false, "keyFile": "../../../Tools/MSSharedLibKey.snk" }, "frameworks": { "net45": { "frameworkAssemblies": { + "mscorlib": "", "System": "", "System.Net": "", "System.Net.Http": "", @@ -26,40 +31,83 @@ "System.Xml": "" } }, - ".NETPortable,Version=v4.5,Profile=Profile111": { - "compilationOptions": { "define": [ "PORTABLE" ] }, - "frameworkAssemblies": { - "System": "", - "System.Collections": "", - "System.Diagnostics.Debug": "", - "System.Diagnostics.Tools": "", - "System.Globalization": "", - "System.IO": "", - "System.Linq": "", - "System.Linq.Expressions": "", - "System.Net": "", - "System.Net.Http": "", - "System.Net.Primitives": "", - "System.ObjectModel": "", - "System.Reflection": "", - "System.Reflection.Extensions": "", - "System.Resources.ResourceManager": "", - "System.Runtime": "", - "System.Runtime.Extensions": "", - "System.Runtime.Serialization": "", - "System.Text.Encoding": "", - "System.Threading": "", - "System.Threading.Tasks": "", - "System.Xml": "", - "System.Xml.XmlSerializer": "" + "netstandard1.1": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50", "portable-net45+win8"], + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", + "System.Collections": "4.0.11-rc2-24027", + "System.Collections.Concurrent": "4.0.12-rc2-24027", + "System.Diagnostics.Debug": "4.0.11-rc2-24027", + "System.Diagnostics.Tools": "4.0.1-rc2-24027", + "System.Diagnostics.Tracing": "4.1.0-rc2-24027", + "System.Globalization": "4.0.11-rc2-24027", + "System.IO": "4.1.0-rc2-24027", + "System.IO.Compression": "4.1.0-rc2-24027", + "System.Linq": "4.1.0-rc2-24027", + "System.Linq.Expressions": "4.0.11-rc2-24027", + "System.Net.Http": "4.0.1-rc2-24027", + "System.Net.Primitives": "4.0.11-rc2-24027", + "System.ObjectModel": "4.0.12-rc2-24027", + "System.Reflection": "4.1.0-rc2-24027", + "System.Reflection.Extensions": "4.0.1-rc2-24027", + "System.Reflection.Primitives": "4.0.1-rc2-24027", + "System.Resources.ResourceManager": "4.0.1-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Runtime.Extensions": "4.1.0-rc2-24027", + "System.Runtime.InteropServices": "4.1.0-rc2-24027", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027", + "System.Runtime.Numerics": "4.0.1-rc2-24027", + "System.Text.Encoding": "4.0.11-rc2-24027", + "System.Text.Encoding.Extensions": "4.0.11-rc2-24027", + "System.Text.RegularExpressions": "4.0.12-rc2-24027", + "System.Threading": "4.0.11-rc2-24027", + "System.Threading.Tasks": "4.0.11-rc2-24027", + "System.Xml.ReaderWriter": "4.0.11-rc2-24027", + "System.Xml.XDocument": "4.0.11-rc2-24027" } }, - "dnxcore50": { - "compilationOptions": { "define": [ "PORTABLE" ] } + "netstandard1.5": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50"], + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", + "System.Collections": "4.0.11-rc2-24027", + "System.Collections.Concurrent": "4.0.12-rc2-24027", + "System.Diagnostics.Debug": "4.0.11-rc2-24027", + "System.Diagnostics.Tools": "4.0.1-rc2-24027", + "System.Diagnostics.Tracing": "4.1.0-rc2-24027", + "System.Globalization": "4.0.11-rc2-24027", + "System.IO": "4.1.0-rc2-24027", + "System.IO.Compression": "4.1.0-rc2-24027", + "System.Linq": "4.1.0-rc2-24027", + "System.Linq.Expressions": "4.0.11-rc2-24027", + "System.Net.Http": "4.0.1-rc2-24027", + "System.Net.Primitives": "4.0.11-rc2-24027", + "System.ObjectModel": "4.0.12-rc2-24027", + "System.Reflection": "4.1.0-rc2-24027", + "System.Reflection.Extensions": "4.0.1-rc2-24027", + "System.Reflection.Primitives": "4.0.1-rc2-24027", + "System.Resources.ResourceManager": "4.0.1-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Runtime.Extensions": "4.1.0-rc2-24027", + "System.Runtime.InteropServices": "4.1.0-rc2-24027", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027", + "System.Runtime.Numerics": "4.0.1-rc2-24027", + "System.Text.Encoding": "4.0.11-rc2-24027", + "System.Text.Encoding.Extensions": "4.0.11-rc2-24027", + "System.Text.RegularExpressions": "4.0.12-rc2-24027", + "System.Threading": "4.0.11-rc2-24027", + "System.Threading.Tasks": "4.0.11-rc2-24027", + "System.Xml.ReaderWriter": "4.0.11-rc2-24027", + "System.Xml.XDocument": "4.0.11-rc2-24027" + } } }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "[2.1.0,3.0)" + "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0)" } } 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 964c013f800da..0000000000000 --- 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/Microsoft.Rest.ClientRuntime.Etw.xproj similarity index 71% rename from ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/ClientRuntime.Etw.xproj rename to ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/Microsoft.Rest.ClientRuntime.Etw.xproj index 492aba798405e..a01545b896f45 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/ClientRuntime.Etw.xproj +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/Microsoft.Rest.ClientRuntime.Etw.xproj @@ -4,18 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + 218d7297-8254-4c70-9c04-33c3d5ee9709 Microsoft.Rest.ClientRuntime - obj\$(MSBuildProjectName) - bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + 2.0 True - + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json index 262b16c29c8ab..0172d6773addc 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Etw/project.json @@ -1,17 +1,22 @@ { - "version": "1.0.0-preview", - "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png", + "version": "2.1.0-preview", "title": "ETW Logger for Microsoft AutoRest Generated Clients", - "summary": "Provides ETW tracing of \"Microsoft.Rest\" Client Library events.", "description": "Enables tracing of event messages for AutoRest generated client libraries events via ETW (Event Tracing for Windows). ETW events can be captured by subscribing to the \"Microsoft.Rest\" event source.", "copyright": "Copyright (c) Microsoft Corporation", "authors": [ "Microsoft" ], - "tags": [ "Microsoft AutoRest ClientRuntime REST ETW" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "compilationOptions": { + "packOptions": { + "summary": "Provides ETW tracing of \"Microsoft.Rest\" Client Library events.", + "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png", + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", + "tags": [ "Microsoft AutoRest ClientRuntime REST ETW" ], + "requireLicenseAcceptance": true, + }, + + "buildOptions": { "delaySign": true, + "publicSign": false, "keyFile": "../../../Tools/MSSharedLibKey.snk" }, @@ -24,6 +29,6 @@ }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "" + "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0.0)" } } 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 a69e35a232c39..0000000000000 --- 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/Microsoft.Rest.ClientRuntime.Log4Net.xproj similarity index 71% rename from ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/ClientRuntime.Log4Net.xproj rename to ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/Microsoft.Rest.ClientRuntime.Log4Net.xproj index d894cdd6a98d8..1811718c63da9 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/ClientRuntime.Log4Net.xproj +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/Microsoft.Rest.ClientRuntime.Log4Net.xproj @@ -4,18 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + 348e414f-101a-4939-99ff-2c994a965a89 Microsoft.Rest.ClientRuntime - obj\$(MSBuildProjectName) - bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + 2.0 True - + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json index c0a4a6977d97a..1d567b2beec6e 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Log4Net/project.json @@ -1,16 +1,20 @@ { - "version": "1.0.0-preview", - "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png", + "version": "2.1.0-preview", "title": "Log4Net Logger for Microsoft AutoRest Generated Clients", - "summary": "Provides Log4Net logging for AutoRest generated client libraries.", "description": "Enables logging of event messages for AutoRest generated client libraries via Log4Net.", "copyright": "Copyright (c) Microsoft Corporation", "authors": [ "Microsoft" ], - "tags": [ "Microsoft AutoRest ClientRuntime REST ETW" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "compilationOptions": { + "packOptions": { + "summary": "Provides Log4Net logging for AutoRest generated client libraries.", + "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png", + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", + "tags": [ "Microsoft AutoRest ClientRuntime REST ETW" ], + "requireLicenseAcceptance": true, + }, + + "buildOptions": { "delaySign": true, "keyFile": "../../../Tools/MSSharedLibKey.snk" }, @@ -28,7 +32,7 @@ }, "dependencies": { - "Microsoft.Rest.ClientRuntime": "", + "Microsoft.Rest.ClientRuntime": "[3.1.0,4.0.0)", "log4net": "2.0.3" } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/ClientRuntime.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj similarity index 69% rename from ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/ClientRuntime.Tests.xproj rename to ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj index e7b88124dd5a8..90dfc5b68cc1f 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/ClientRuntime.Tests.xproj +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/Microsoft.Rest.ClientRuntime.Tests.xproj @@ -4,20 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + f7f20e35-43ee-4fcc-bf83-7bf93b192bc8 Microsoft.Rest.ClientRuntime.Tests - obj\$(MSBuildProjectName) - bin\$(MSBuildProjectName)\ + .\obj + .\bin\ 2.0 - True - + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json index a7c5a7a07395c..3a4bd75d7e94e 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tests/project.json @@ -1,28 +1,30 @@ { - "version": "1.4.2-preview", - "summary": "ClientRuntime Tests.", + "version": "2.0.0-preview", "authors": [ "Microsoft" ], - "tags": [ "Microsoft AutoRest ClientRuntime REST" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "commands": { - "test": "xunit.runner.dnx" + + "packOptions": { + "summary": "ClientRuntime Tests.", + "tags": [ "Microsoft AutoRest ClientRuntime REST" ], + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", }, + + "testRunner": "xunit", "frameworks": { - "dnxcore50": { - "dependencies": { - "System.Diagnostics.Tools": "4.0.0", - "System.Net.Http": "4.0.0", - "System.Threading.Tasks": "4.0.10", - "System.Xml.ReaderWriter": "4.0.10", - "Microsoft.CSharp": "4.0.0", - "xunit.runner.dnx": "2.1.0-rc1-build198" - } + "netcoreapp1.0": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50", "portable-net45+win8"] } }, - "dependencies": { - "Microsoft.Rest.ClientRuntime": "", - "xunit": "2.1.0" + "Microsoft.NETCore.App": { + "type": "platform", + "version": "1.0.0-rc2-*" + }, + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.Rest.ClientRuntime.Azure": "[4.1.0,5.0.0)", + "Microsoft.Rest.ClientRuntime.Azure.Authentication": "[3.1.0-preview,4.0.0)", + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-rc2-build10015" } } 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 c2a5eab70b1bb..0000000000000 --- 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/Log4NetTracingInterceptorTest.cs b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Log4NetTracingInterceptorTest.cs index ba1259354d823..4e56f21dbb18b 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/ClientRuntime.Tracing.Tests.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj similarity index 67% rename from ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/ClientRuntime.Tracing.Tests.xproj rename to ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj index 67c1c975bd70d..795cd4457fe2c 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/ClientRuntime.Tracing.Tests.xproj +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/Microsoft.Rest.ClientRuntime.Tracing.Tests.xproj @@ -4,17 +4,17 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + 52c61f15-bf86-41dc-93d1-05d3da70f032 Microsoft.Rest.ClientRuntime.Tracing.Tests - obj\$(MSBuildProjectName) - bin\$(MSBuildProjectName)\ + .\obj + .\bin\ + 2.0 - True - + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json index ea992074ccead..e0ebf1057a1f4 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime.Tracing.Tests/project.json @@ -1,13 +1,18 @@ { - "version": "1.4.2-preview", - "summary": "ClientRuntime Tests.", + "version": "2.0.0-preview", "authors": [ "Microsoft" ], - "tags": [ "Microsoft AutoRest ClientRuntime REST" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", + "packOptions": { + "summary": "ClientRuntime Tests.", + "tags": [ "Microsoft AutoRest ClientRuntime REST" ], + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", + }, + + "testRunner": "xunit", "frameworks": { "net45": { + "imports": ["net451","dnxcore50"], "frameworkAssemblies": { "System": "", "System.Runtime": "", @@ -15,12 +20,14 @@ } } }, - "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", + "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.41", + "Microsoft.Rest.ClientRuntime.Log4Net": "[2.1.0-preview,3.0.0)", + "Microsoft.Rest.ClientRuntime.Etw": "[2.1.0-preview,3.0.0)", + "Newtonsoft.Json": "8.0.3", "xunit": "2.1.0", - "xunit.runner.visualstudio": "2.1.0", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.39", - "Microsoft.Rest.ClientRuntime.Log4Net": "", - "Microsoft.Rest.ClientRuntime.Etw": "" + "dotnet-test-xunit": "1.0.0-rc2-build10015" } } diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ClientRuntime.xproj b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Microsoft.Rest.ClientRuntime.xproj similarity index 73% rename from ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ClientRuntime.xproj rename to ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Microsoft.Rest.ClientRuntime.xproj index 9ec1066d1fb5a..51cccd7cff923 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/ClientRuntime.xproj +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/Microsoft.Rest.ClientRuntime.xproj @@ -4,18 +4,19 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + eddb6367-5c7b-428c-b54c-96bcd90f6e6c Microsoft.Rest.ClientRuntime - obj\$(Configuration) - bin + .\obj + .\bin\ + 2.0 True - + \ No newline at end of file diff --git a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json index 82724c95bf56c..6849622af5aee 100644 --- a/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json +++ b/ClientRuntimes/CSharp/Microsoft.Rest.ClientRuntime/project.json @@ -1,24 +1,29 @@ { - "version": "2.2.0", + "version": "3.1.0", "copyright": "Copyright (c) Microsoft Corporation", - "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png", "title": "Client Runtime Library for Microsoft AutoRest Generated Clients", - "summary": "Provides HttpClient infrastructure for clients generated by AutoRest.", "description": "Infrastructure for error handling, tracing, and HttpClient pipeline configuration. Required by client libraries generated using AutoRest. \nSupported Platforms:\n - Portable Class Libraries\n - .NET Framework 4.5\n - Windows 8\n - Windows Phone 8.1\n - DotNet Core", "authors": [ "Microsoft" ], - "tags": [ "Microsoft AutoRest ClientRuntime REST" ], - "projectUrl": "https://github.com/Azure/AutoRest", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "requireLicenseAcceptance": true, - "compilationOptions": { + "packOptions": { + "summary": "Provides HttpClient infrastructure for clients generated by AutoRest.", + "iconUrl": "https://cdn.rawgit.com/Azure/AutoRest/7c1576dfb56974176223545cfac5762d168ded5f/Documentation/images/autorest-small-flat.png", + "projectUrl": "https://github.com/Azure/AutoRest", + "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", + "tags": [ "Microsoft AutoRest ClientRuntime REST" ], + "requireLicenseAcceptance": true, + }, + + "buildOptions": { "delaySign": true, + "publicSign": false, "keyFile": "../../../Tools/MSSharedLibKey.snk" }, - "frameworks": { + "frameworks": { "net45": { "frameworkAssemblies": { + "mscorlib": "", "System": "", "System.Net": "", "System.Net.Http": "", @@ -27,50 +32,52 @@ "System.Xml": "" }, "dependencies": { - "Newtonsoft.Json": "6.0.8" + "Newtonsoft.Json": "8.0.3" } - }, - ".NETPortable,Version=v4.5,Profile=Profile111": { - "compilationOptions": { "define": [ "PORTABLE" ] }, - "frameworkAssemblies": { - "System": "", - "System.Collections": "", - "System.Diagnostics.Debug": "", - "System.Diagnostics.Tools": "", - "System.Globalization": "", - "System.IO": "", - "System.Linq": "", - "System.Net": "", - "System.Net.Http": "", - "System.Net.Primitives": "", - "System.ObjectModel": "", - "System.Reflection": "", - "System.Reflection.Extensions": "", - "System.Resources.ResourceManager": "", - "System.Runtime": "", - "System.Runtime.Extensions": "", - "System.Runtime.Serialization": "", - "System.Text.Encoding": "", - "System.Text.RegularExpressions": "", - "System.Threading": "", - "System.Threading.Tasks": "", - "System.Xml": "", - "System.Xml.ReaderWriter": "" - }, + }, + "netstandard1.1": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50", "portable-net45+win8"], "dependencies": { - "Newtonsoft.Json": "6.0.8" + "NETStandard.Library": "1.5.0-rc2-24027", + "Newtonsoft.Json": "8.0.3" } }, - "dnxcore50": { - "compilationOptions": { "define": [ "PORTABLE" ] }, + "netstandard1.5": { + "buildOptions": { "define": [ "PORTABLE" ] }, + "imports": ["dnxcore50"], "dependencies": { - "Microsoft.CSharp": "4.0.0", - "System.Diagnostics.Tools": "4.0.0", - "System.Net.Http": "4.0.0", - "System.Runtime.Serialization.Primitives": "4.0.10", - "System.Threading.Tasks": "4.0.10", - "System.Xml.ReaderWriter": "4.0.10", - "Newtonsoft.Json": "7.0.1" + "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", + "Microsoft.NETCore.Runtime": "1.0.2-rc2-24027", + "System.Collections": "4.0.11-rc2-24027", + "System.Collections.Concurrent": "4.0.12-rc2-24027", + "System.Diagnostics.Debug": "4.0.11-rc2-24027", + "System.Diagnostics.Tools": "4.0.1-rc2-24027", + "System.Diagnostics.Tracing": "4.1.0-rc2-24027", + "System.Globalization": "4.0.11-rc2-24027", + "System.IO": "4.1.0-rc2-24027", + "System.IO.Compression": "4.1.0-rc2-24027", + "System.Linq": "4.1.0-rc2-24027", + "System.Net.Http": "4.0.1-rc2-24027", + "System.Net.Primitives": "4.0.11-rc2-24027", + "System.ObjectModel": "4.0.12-rc2-24027", + "System.Reflection": "4.1.0-rc2-24027", + "System.Reflection.Extensions": "4.0.1-rc2-24027", + "System.Reflection.Primitives": "4.0.1-rc2-24027", + "System.Resources.ResourceManager": "4.0.1-rc2-24027", + "System.Runtime": "4.1.0-rc2-24027", + "System.Runtime.Extensions": "4.1.0-rc2-24027", + "System.Runtime.InteropServices": "4.1.0-rc2-24027", + "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027", + "System.Runtime.Numerics": "4.0.1-rc2-24027", + "System.Text.Encoding": "4.0.11-rc2-24027", + "System.Text.Encoding.Extensions": "4.0.11-rc2-24027", + "System.Text.RegularExpressions": "4.0.12-rc2-24027", + "System.Threading": "4.0.11-rc2-24027", + "System.Threading.Tasks": "4.0.11-rc2-24027", + "System.Xml.ReaderWriter": "4.0.11-rc2-24027", + "System.Xml.XDocument": "4.0.11-rc2-24027", + "Newtonsoft.Json": "8.0.3" } } } diff --git a/Tools/DnxBuild.cmd b/Tools/DnxBuild.cmd deleted file mode 100644 index 6bf487fa7f4e4..0000000000000 --- a/Tools/DnxBuild.cmd +++ /dev/null @@ -1,8 +0,0 @@ -call .\dnx-coreclr-win-x86.1.0.0-beta7\bin\dnu restore ..\ClientRuntimes\CSharp\ClientRuntime\Microsoft.Rest.ClientRuntime -call .\dnx-coreclr-win-x86.1.0.0-beta7\bin\dnu build ..\ClientRuntimes\CSharp\ClientRuntime\Microsoft.Rest.ClientRuntime --configuration release --out ..\dnx -call .\dnx-coreclr-win-x86.1.0.0-beta7\bin\dnu restore ..\ClientRuntimes\CSharp\ClientRuntime.Azure\Microsoft.Rest.ClientRuntime.Azure -call .\dnx-coreclr-win-x86.1.0.0-beta7\bin\dnu build ..\ClientRuntimes\CSharp\ClientRuntime.Azure\Microsoft.Rest.ClientRuntime.Azure --configuration release --out ..\dnx -xcopy ..\dnx\release\dnxcore50 ..\binaries\dnxcore50 /I /Y - - - diff --git a/Tools/DnxInstall.cmd b/Tools/DnxInstall.cmd deleted file mode 100644 index 0bcf011ba80bd..0000000000000 --- a/Tools/DnxInstall.cmd +++ /dev/null @@ -1,6 +0,0 @@ -pushd %~dp0 -call .\nuget.exe install dnx-clr-win-x86 -Version 1.0.0-beta7 -Prerelease -call .\nuget.exe install dnx-coreclr-win-x86 -Version 1.0.0-beta7 -Prerelease -popd - - diff --git a/Tools/NuGet.exe b/Tools/NuGet.exe index 324daa842c51a..0bc3a2e857c98 100644 Binary files a/Tools/NuGet.exe and b/Tools/NuGet.exe differ diff --git a/build.proj b/build.proj index b7466578f0bb4..5a2cb40273264 100644 --- a/build.proj +++ b/build.proj @@ -69,7 +69,6 @@ all $(LibraryToolsFolder)\7-Zip $(ZipExeFolder)\7z.exe - 1.0.0-rc1-final @@ -99,14 +98,15 @@ - - + + + - + - +