Skip to content

Commit

Permalink
Removed DNX from the branch, fixed project.json warnings, re-recorded…
Browse files Browse the repository at this point in the history
… failing tests.
  • Loading branch information
Hovsep Mkrtchyan committed Jun 2, 2016
1 parent 1242234 commit 0b27551
Show file tree
Hide file tree
Showing 74 changed files with 37,274 additions and 45,002 deletions.
12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@ that take advantage of scalable cloud computing resources.
### Target Frameworks:

* .NET Framework 4.5
* dnxcore50, based on the .NET Core framework
* .NET Portable Framework, using profile 111
* netstandard1.5, based on the NetCore framework
* .NET Portable Framework/netstandard1.1 for NetCore, using profile 111

### Prerequisites:
Visual Studio 2015 RTM with ASP.NET. For details, check out the [installation doc](http://docs.asp.net/en/latest/getting-started/installing-on-windows.html).

Note, after done, run "_dnvm list_" command to check the 'coreclr' runtime is installed with right version of '_1.0.0-rc1-final_'. If not, run “_dnvm install 1.0.0-rc1-final -r coreclr -a x64 -Persistent_”. Remember always use "_-Persistent_" flag, so the selection can persist.
Install CoreCLR RC2 using [these steps](https://www.microsoft.com/net/core#windows).

### Known issue and workaround:
Due to this [build issue on portable framework](aspnet/dnx#2967), when install VS 2015, use the default option. If you didn't, go to “_C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\\.NETPortable\v4.5\Profile\Profile111\SupportedFrameworks_”, remove several profile xmls and only keep core targets of “_.NET Framework 4.5.xml_”, “_Windows 8.xml_”, and “_Windows Phone 8.1.xml_”.

### To build:

Expand Down Expand Up @@ -49,9 +46,8 @@ Using the command line:
### To on-board new libraries
Follow existing library and create a new folder under "ResourceManagement". 2 notes
- To simplify test discovery, the test folder must be named with ".test" or ".tests"
- To workaround the [dnx bug](https://github.com/aspnet/dnx/issues/2216), add a new entry to [global.json](https://github.com/Azure/azure-sdk-for-net/blob/AutoRest/global.json)

If for platform reasons that your library won't use dnx project system, 2 notes
If for platform reasons that your library won't use NetCore project system, 2 notes
- In your library csproject file, set the msbuild property "AutoRestProjects" to "true"
- In your test project files, set both "AutoRestProjects" and "SDKTestProject" to "true"
- To simplify test discovery, the test folder must be named with ".tests"
Expand Down
8 changes: 4 additions & 4 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,15 @@

<!-- Restoring everyting from the root folder wipes out Storage nuget references and adds Storage project reference to all projects. -->
<Exec Command="dotnet restore" WorkingDirectory="%(NetCore_AutoRestLibraries.Library)" Condition=" @(NetCore_AutoRestLibraries) != '' "/>
<Exec Command="dotnet restore" WorkingDirectory="%(NetCore_AutoRestLibraries.Test)" Condition=" @(NetCore_AutoRestLibraries) != '' and '%(Dnx_AutoRestLibraries.Test)' != '' and '$(Configuration)' != 'Release' "/>
<Exec Command="dotnet restore" WorkingDirectory="%(NetCore_AutoRestLibraries.Test)" Condition=" @(NetCore_AutoRestLibraries) != '' and '%(NetCore_AutoRestLibraries.Test)' != '' and '$(Configuration)' != 'Release' "/>

<CallTarget Targets="BuildNetCoreLibraries" Condition=" @(NetCore_AutoRestLibraries) != '' " />
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
</Target>

<Target Name="BuildNetCoreLibraries">
<Exec Command="dotnet build --configuration $(Configuration)" WorkingDirectory="%(NetCore_AutoRestLibraries.Library)" Condition=" '%(Dnx_AutoRestLibraries.Library)'!= '' "/>
<Exec Command="dotnet build --configuration $(Configuration)" WorkingDirectory="%(NetCore_AutoRestLibraries.Test)" Condition=" '$(Configuration)' != 'Release' and '%(Dnx_AutoRestLibraries.Test)' != '' "/>
<Exec Command="dotnet build --configuration $(Configuration)" WorkingDirectory="%(NetCore_AutoRestLibraries.Library)" Condition=" '%(NetCore_AutoRestLibraries.Library)'!= '' "/>
<Exec Command="dotnet build --configuration $(Configuration)" WorkingDirectory="%(NetCore_AutoRestLibraries.Test)" Condition=" '$(Configuration)' != 'Release' and '%(NetCore_AutoRestLibraries.Test)' != '' "/>
</Target>

<Target Name="Clean" DependsOnTargets="BuildMsBuildTask;PrepareForAutoRestLibraries;RestoreNugetPackages;">
Expand Down Expand Up @@ -171,7 +171,7 @@
<!--Based on https://github.com/xunit/xunit/issues/653, only xml is supported -->
<Exec Command="dotnet test -xml &quot;$(MSBuildProjectDirectory)\TestResults\%(NetCore_AutoRestLibraries.Filename).xml&quot;"
WorkingDirectory="%(NetCore_AutoRestLibraries.Test)"
Condition=" @(NetCore_AutoRestLibraries) != '' and '%(Dnx_AutoRestLibraries.Test)' != '' "/>
Condition=" @(NetCore_AutoRestLibraries) != '' and '%(NetCore_AutoRestLibraries.Test)' != '' "/>
</Target>

<PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Batch/Src/GeneratedProtocol/Models/BatchErrorException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ namespace Microsoft.Azure.Batch.Protocol.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 BatchError information.
/// </summary>
#if !PORTABLE && !DNXCORE50
#if !PORTABLE
[Serializable]
#endif
public class BatchErrorException : RestException
Expand Down Expand Up @@ -75,7 +75,7 @@ public BatchErrorException(string message, Exception innerException)
{
}

#if !PORTABLE && !DNXCORE50
#if !PORTABLE
/// <summary>
/// Initializes a new instance of the BatchErrorException class.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"buildOptions": {
"delaySign": true,
"publicSign": false,
"keyFile": "../../../../tools/MSSharedLibKey.snk"
"keyFile": "../../../../tools/MSSharedLibKey.snk",
"compile": "../../../../tools/DisableTestRunParallel.cs"
},

"testRunner": "xunit",
Expand All @@ -35,6 +36,5 @@
"Microsoft.Azure.ResourceManager": "1.0.0-preview",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-build10015"
},
"compileFiles": "../../../../tools/DisableTestRunParallel.cs"
}
}
Loading

0 comments on commit 0b27551

Please sign in to comment.