forked from dotnet/orleans
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
vNext Removal and merge with *.2017.csproj files (dotnet#3231)
* Merge vNext\src to 2017 csproj files. Delete vNext folder. Update CI build file to build 2017 sln with Current BuildFlavor. Move NuGet PackageReference Versions to props file. * Update BenchmarkDotNet version to fix netfx build failure. * Add TargetFramework to OrleansHost and OrleansManager project. Add dotnet.exe to Path to see if CI picks it up for building F#. * Disable F# because of CI server for now. * Change project factory guids in SLN file to CPS ones. Remove F# projects from default build configuration. * Removed legacy files. * Cleanup csproj files. Annotate props files with comments. Add back FSharp support. * Change dotnet cli to 2.0.0 Fix OrleansBondUtils.csproj by adding condition to package fallback Include OrleansGCPUtils in solution Add build script wrapper Update CI script to always use net462 machine until netstandard 2.0 update. * Fix FSharp implicit references Add TestInternalGrainInterfaces to solution * Add PackageOutputPath for easier build consumption for local builds Change legacy version to 1.6.0 to match with master Remove unused parts from props file * Add BuildFlavor and Configuration to Bootstrap folder structure and based it on RepoRoot variable Move Bootstrap into root folder Delete now unneeded targets file in test folder Rename RepoRoot to SourceRoot * Move from netstandard 1.5 to 2.0 * Address feedback * Add #if to AppDomain class usage * Add DesignTime build check * Increase build stability. * Add NuGet.config for CI Enable parallel builds in Build-Core.cmd * Revert back to net462 and netstandard15 for this PR. NetStandard 2.0 will be a separate one * Adding back /m:1 because of CI * Update test running scripts to honor platform argument
- Loading branch information
1 parent
e7d5ff7
commit 9c32519
Showing
479 changed files
with
2,180 additions
and
21,136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,35 @@ | ||
| @if not defined _echo @echo off | ||
| setlocal | ||
|
|
||
| if [%1]==[] GOTO NETFX | ||
| if [%1]==[netfx] GOTO NETFX | ||
| if [%1]==[netstandard-win] GOTO VNEXT | ||
| if [%1]==[netstandard] GOTO VNEXT | ||
| if [%1]==[] GOTO CURRENT | ||
| if [%1]==[current] GOTO CURRENT | ||
| if [%1]==[netstandard-win] GOTO CURRENT | ||
| if [%1]==[netstandard] GOTO CURRENT | ||
| if [%1]==[netfx] GOTO LEGACY | ||
| if [%1]==[legacy] GOTO LEGACY | ||
| if [%1]==[all] GOTO ALL | ||
|
|
||
| :NETFX | ||
| cmd /c "%~dp0src\Build.cmd" | ||
| :CURRENT | ||
| set BuildFlavor= | ||
| cmd /c "%~dp0Build-Core.cmd" | ||
| set exitcode=%errorlevel% | ||
| GOTO END | ||
|
|
||
| :VNEXT | ||
| cmd /c "%~dp0vNext\Build.cmd" | ||
| :LEGACY | ||
| set BuildFlavor=Legacy | ||
| cmd /c "%~dp0Build-Core.cmd" | ||
| set exitcode=%errorlevel% | ||
| GOTO END | ||
|
|
||
| :ALL | ||
| cmd /c "%~dp0src\Build.cmd" | ||
| set BuildFlavor= | ||
| cmd /c "%~dp0Build-Core.cmd" | ||
| set exitcode=%errorlevel% | ||
| cmd /c "%~dp0vNext\Build.cmd" | ||
|
|
||
| set BuildFlavor=Legacy | ||
| cmd /c "%~dp0Build-Core.cmd" | ||
| set /a exitcode=%errorlevel%+%exitcode% | ||
|
|
||
| :END | ||
| endlocal&set exitcode=%exitcode% | ||
| exit /B %exitcode% | ||
| exit /B %exitcode% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <Project> | ||
| <!-- Begin Orleans: Without these lines the project won't build properly --> | ||
| <!-- Set path to ClientGenerator.exe --> | ||
| <PropertyGroup Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' "> | ||
| <!--<OrleansReferencesBase>$(ProjectDir)../Bootstrap/$(BuildFlavor)/$(Configuration)</OrleansReferencesBase>--> | ||
| <OrleansReferencesBase>$(SourceRoot)/Bootstrap/$(BuildFlavor)/$(Configuration)/</OrleansReferencesBase> | ||
| </PropertyGroup> | ||
| <Import Project="$(SourceRoot)/src/Orleans.SDK.targets" Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' and Exists('$(SourceRoot)/src/Orleans.SDK.targets') " /> | ||
| <!--End Orleans --> | ||
| </Project> |
Oops, something went wrong.