Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ported CSharp ClientRuntimes to CoreCLR RC2 #1084

Merged
merged 36 commits into from
May 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
646e72a
Converting CSharp ClientRuntime projects to CoreClr
Apr 13, 2016
74692a0
Fixed Microsoft.Rest.ClientRuntime.Tracing.Tests test and removed xpr…
Apr 20, 2016
62dfbcc
Fixed CSharp Generators test project
Apr 20, 2016
05e8518
Fixed build.proj to use netcore instead of dnu.
Apr 21, 2016
f510e4d
Merge branch 'master' of github.com:Azure/AutoRest into netcore
Apr 23, 2016
e39bf6d
Merge branch 'master' of github.com:Azure/AutoRest into netcore
May 16, 2016
71bc552
Moved to CoreClr RC2 public preview
May 17, 2016
111d7d5
Merge branch 'master' of github.com:Azure/AutoRest into netcore
May 17, 2016
e23db71
Merge pull request #1047 from Azure/master
May 17, 2016
6cb707c
Merge branch 'netcore' of github.com:Azure/AutoRest into netcore
May 17, 2016
69a989d
Fixed gulpfile.js
May 18, 2016
ffe7e89
Fixed netcore build warnings.
May 18, 2016
bc85f48
Merge pull request #1052 from Azure/master
May 18, 2016
5681eea
Merge branch 'netcore' of github.com:Azure/AutoRest into netcore
May 18, 2016
02f34b8
Merge pull request #1058 from Azure/master
May 18, 2016
773e9f1
Merge branch 'netcore' of github.com:Azure/AutoRest into netcore
May 18, 2016
8151cf6
Fixed travis.yml to use coreclr rc2 instead of dnx
May 18, 2016
6825c6c
Fixing net 4.5.2 reference in test project.
May 18, 2016
d76911a
Skipped Generators tests in travis.
May 19, 2016
6c2547a
changed test server package dependency
May 19, 2016
f1ac322
Fixed travis.yml
May 19, 2016
9a0b774
updated NuGet.exe to 3.5-beta
May 19, 2016
4ce0ca2
removed mono from travis.yml
May 19, 2016
7dc762c
Changing NodeJS Azure LRO tests base URI
May 19, 2016
8fa3955
Changed the url for LROS and paging on the test server
May 19, 2016
a1ac974
Changed . in Java test URI
May 19, 2016
191cac8
Bringing back Generator tests to Linux run
May 19, 2016
7f2b179
Fixed remaining Java tests with . in the base URI
May 19, 2016
eba3a94
fixed python test with . in base UR
May 20, 2016
79a1c2c
Fixed test project build failure in VS2015
May 20, 2016
9c26eea
Added AcceptanceTestPath to the exception message.
May 20, 2016
630ea05
Changed nuget package test to be called after each language generator…
May 20, 2016
de3e3c4
Added Generator CSharp tests to ClientRuntime solution
May 21, 2016
72b915b
Cleaning dnx from gitignore and tools
May 23, 2016
25a2716
Removed dnxcore50 from generated code.
May 24, 2016
7f5ae11
Fixed AutoRest.sln test references fro CSharp Generators
May 24, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
20 changes: 7 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: csharp
sudo: false
mono:
- beta
sudo: required
dist: trusty
addons:
apt:
sources:
Expand All @@ -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
Expand All @@ -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: ============"
Expand Down
186 changes: 154 additions & 32 deletions AutoRest.sln

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions AutoRest/AutoRest.Core/Logging/CodeGenerationException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Microsoft.Rest.Generator.Logging
/// <summary>
/// Code generation aggregate exception.
/// </summary>
#if !DNXCORE50
#if !PORTABLE
[Serializable]
#endif
public class CodeGenerationException : AggregateException
Expand Down Expand Up @@ -38,7 +38,7 @@ public CodeGenerationException(string message, Exception innerException) : base(
{
}

#if !DNXCORE50
#if !PORTABLE
/// <summary>
/// Instantiates a new instance of the CodeGenerationException class.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\packages\xunit.runner.msbuild.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.props" Condition="Exists('..\..\..\..\packages\xunit.runner.msbuild.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.props')" />
<Import Project="..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
<Import Project="..\..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\..\..\..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
Expand All @@ -12,10 +13,8 @@
<RootNamespace>Microsoft.Rest.Generator.AzureResourceSchema.Tests</RootNamespace>
<RootNamespace>AutoRest.Generator.AzureResourceSchema.Tests</RootNamespace>
<AssemblyName>AutoRest.Generator.AzureResourceSchema.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25123" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25123</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>43dfef27-2fd7-4827-a669-dfd2dd1cbbcc</ProjectGuid>
<RootNamespace>Azure.CSharp.Tests</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -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

/// <summary>
/// Exception thrown for an invalid response with Error information.
/// </summary>
#if !PORTABLE && !DNXCORE50
#if !PORTABLE
[Serializable]
#endif
public class ErrorException : RestException
Expand Down Expand Up @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
{
}

#if !PORTABLE && !DNXCORE50
#if !PORTABLE
/// <summary>
/// Initializes a new instance of the ErrorException class.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

/// <summary>
/// Exception thrown for an invalid response with Error information.
/// </summary>
#if !PORTABLE && !DNXCORE50
#if !PORTABLE
[Serializable]
#endif
public class ErrorException : RestException
Expand Down Expand Up @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
{
}

#if !PORTABLE && !DNXCORE50
#if !PORTABLE
/// <summary>
/// Initializes a new instance of the ErrorException class.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

/// <summary>
/// Exception thrown for an invalid response with Error information.
/// </summary>
#if !PORTABLE && !DNXCORE50
#if !PORTABLE
[Serializable]
#endif
public class ErrorException : RestException
Expand Down Expand Up @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
{
}

#if !PORTABLE && !DNXCORE50
#if !PORTABLE
/// <summary>
/// Initializes a new instance of the ErrorException class.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

/// <summary>
/// Exception thrown for an invalid response with Error information.
/// </summary>
#if !PORTABLE && !DNXCORE50
#if !PORTABLE
[Serializable]
#endif
public class ErrorException : RestException
Expand Down Expand Up @@ -65,7 +65,7 @@ public ErrorException(string message, Exception innerException)
{
}

#if !PORTABLE && !DNXCORE50
#if !PORTABLE
/// <summary>
/// Initializes a new instance of the ErrorException class.
/// </summary>
Expand Down
Loading