Merge feature/msbuild to dev #171
Conversation
Fix _dotnet-test.shade parse error
| { | ||
| # Install the version of dotnet-cli used to compile | ||
| & "$koreBuildFolder\dotnet\dotnet-install.ps1" -Channel $dotnetChannel -Version $dotnetVersion -Architecture x64 | ||
| InstallSharedRuntime '1.0.0' 'preview' |
There was a problem hiding this comment.
Do none of our tools need 1.0.0 anymore?
There was a problem hiding this comment.
A few of our tools do, but the 1.0.0-rc4 SDK installs both the 1.0.4 and 1.1.1 runtimes automatically
build/KoreBuild.ps1
Outdated
| } | ||
| InstallSharedRuntime $env:KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION $channel | ||
| } | ||
| # TODO restore installing pre-release versions of sharedfx when we upgrade to .NET Core 2.0 |
There was a problem hiding this comment.
No TODOs or commented out code.
build/KoreBuild.ps1
Outdated
|
|
||
| if (!(Test-Path "$koreBuildFolder\Sake")) | ||
| # We still nuget because dotnet doesn't have support for pushing packages | ||
| # TODO remove. dotnet nuget push now exists |
There was a problem hiding this comment.
Let's file a bug and remove the todo.
build/KoreBuild.sh
Outdated
| install_shared_runtime $KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION $channel | ||
| fi | ||
| $koreBuildFolder/dotnet/dotnet-install.sh --channel $KOREBUILD_DOTNET_CHANNEL --version $KOREBUILD_DOTNET_VERSION | ||
| # TODO restore installing pre-release versions of sharedfx when we upgrade to .NET Core 2.0 |
build/NuGet.config
Outdated
| <add key="aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" /> | ||
| </packageSources> | ||
| </configuration> | ||
| </configuration> |
| .PARAMETER NoPath | ||
| By default this script will set environment variable PATH for the current process to the binaries folder inside installation folder. | ||
| If set it will display binaries location but not set any environment variable. | ||
| .PARAMETER Verbose |
There was a problem hiding this comment.
Seems unrelated to the msbuild conversion. Make this a separate commit
There was a problem hiding this comment.
These changes reflect updates and bug fixes to the dotnet-install.ps1 script in https://github.com/dotnet/cli. The layout of assets on dotnetcli.azureedge.net is slightly different for the MSBuild SDK than it was for project.json SDK.
| --> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- TODO if VS Test doesn't make minimal output the default log setting, we can set that here. cref https://github.com/Microsoft/vstest/issues/301 --> |
| ################################################################### | ||
| --> | ||
| <Target Name="PackageProjects"> | ||
| <!-- TODO consider using GeneratePackageOnBuild or calling Pack on the solution. |
There was a problem hiding this comment.
Tracking issue + Remove todo
|
|
||
| <Target Name="Rebuild" DependsOnTargets="RebuildSolutions" /> | ||
|
|
||
| <!-- TODO implement. See https://github.com/aspnet/BuildTools/issues/162 --> |
There was a problem hiding this comment.
Remove the target since it's not doing anything
build/KoreBuild.ps1
Outdated
|
|
||
| $env:KOREBUILD_FOLDER=$koreBuildFolder | ||
| &"$koreBuildFolder\Sake\0.2.2\tools\Sake.exe" -I $koreBuildFolder\shade -f $makeFilePath @args | ||
| exec dotnet build `@"$msBuildResponseFile" |
There was a problem hiding this comment.
Add a trailing new line to these files. There's a bunch missing these
Resolves #182
|
Will do this later. Too many people still using 'dev' branch. |
|
MVC merged sooner than expected. Now all Universe repos are on feature/msbuild. Let's move this to dev. |
|
🆙 📅 added changes per PR feedback |
|
Before we merge this, I've tagged the current version of 'dev' as "legacy-build". I'm updating any other aspnet repos to use this so that merging this MSBuild work shouldn't break them. This intentionally means that anyone using "legacy-build" won't receive updates as we're no longer updating our project.json scripts. |
We only have two repos left on 'dev' EF and MVC. I'll pin their build.ps1 before we merge this.
This deprecates support for building project.json with KoreBuild.