more fixes to protofx build
This commit is contained in:
Родитель
c25757426c
Коммит
e5cfed06db
|
@ -335,12 +335,19 @@ if '%RestorePackages%' == 'true' (
|
|||
.\.nuget\NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget\nuget.config
|
||||
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure
|
||||
)
|
||||
if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
|
||||
|
||||
:: Restore the Tools directory
|
||||
call %~dp0init-tools.cmd
|
||||
)
|
||||
|
||||
set _dotnetexe=%~dp0Tools\dotnetcli\dotnet.exe
|
||||
|
||||
if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (
|
||||
|
||||
:: Restore the Tools directory
|
||||
call %~dp0init-tools.cmd
|
||||
|
||||
set _dotnetexe=%~dp0Tools\dotnetcli\dotnet.exe
|
||||
pushd .\lkg & %_dotnetexe% restore &popd
|
||||
@if ERRORLEVEL 1 echo Error: dotnet restore failed && goto :failure
|
||||
|
||||
|
|
|
@ -742,7 +742,7 @@
|
|||
<Choose>
|
||||
<When Condition="Exists('$(FSharpSourcesRoot)\..\lkg\bin\Debug\netstandard1.6\win7-x64\publish\fsc.exe')">
|
||||
<PropertyGroup >
|
||||
<FSharpTargetsPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin\Microsoft.FSharp.Targets</FSharpTargetsPath>
|
||||
<FSharpTargetsPath>..\lkg\FSharp-$(LkgVersion)\bin\Microsoft.FSharp.Targets</FSharpTargetsPath>
|
||||
<FscToolPath>$(FSharpSourcesRoot)\..\lkg\bin\Debug\netstandard1.6\win7-x64\publish</FscToolPath>
|
||||
<FSLKGPath>$(FSharpSourcesRoot)\..\lkg\FSharp-$(LkgVersion)\bin</FSLKGPath>
|
||||
<FSCoreLKGPath>$(FSLKGPath)\FSharp.Core.dll</FSCoreLKGPath>
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
@if "%_echo%"=="" echo off
|
||||
@rem ===========================================================================================================
|
||||
@rem Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License,
|
||||
@rem Version 2.0. See License.txt in the project root for license information.
|
||||
@rem ===========================================================================================================
|
||||
|
||||
@echo off
|
||||
setlocal
|
||||
|
||||
if /i "%1" == "debug" goto :ok
|
||||
if /i "%1" == "release" goto :ok
|
||||
|
|
Загрузка…
Ссылка в новой задаче