Skip to content

Publish lkg as platform app dependent on Tools dotnetcli #1707

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.

Sign up for GitHub

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

Merged
KevinRansom merged 3 commits into from
Nov 4, 2016
Merged

Publish lkg as platform app dependent on Tools dotnetcli #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79e3568
fix merge
KevinRansom Nov 4, 2016
b04c35d
Publish lkg using platform
KevinRansom Nov 4, 2016
0c80a4d
nothing
KevinRansom Nov 4, 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
22 changes: 10 additions & 12 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@if "%_echo%"=="" echo off
@if "%_echo%"=="" echo off

setlocal enableDelayedExpansion

Expand Down Expand Up @@ -478,12 +478,11 @@ if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '0' (
rem Build Proto
if '%BUILD_PROTO%' == '1' (
if '%BUILD_PROTO_WITH_CORECLR_LKG%' == '1' (

pushd .\lkg & %_dotnetexe% restore &popd
@if ERRORLEVEL 1 echo Error: dotnet restore failed && goto :failure

pushd .\lkg & %_dotnetexe% publish project.json -o %~dp0\Tools\lkg -r win7-x64 &popd
@if ERRORLEVEL 1 echo Error: dotnet publish failed && goto :failure
echo on
Copy link
Member

@brettfo brettfo Nov 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is echo turned on here? The console output of the following commands will still be visible, just not what they were invoked with.

Otherwise, indention.

pushd .\lkg\fsc & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure
Copy link
Member

@brettfo brettfo Nov 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This error will never trigger because ERRORLEVEL will have been set to 0 by popd which should always succeed. Each of these lines should be split out into:

pushd .\lkg\fsc
%_dotnetexe% restore
if ERRORLEVEL 1 (
    echo Error:%errorlevel% dotnet restore failed
    goto failure
)
popd

Copy link
Contributor Author

@KevinRansom KevinRansom Nov 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brettfo
Yeah, I'm pretty sure that I thought that too. It turns out that popd doesn't alter the errorvalue.

A test script

pushd c:\temp
cd
c:\kevinransom\visualfsharp\tools\dotnetcli\dotnet restore project.json
popd
if ERRORLEVEL 1 echo Error: dotnet publish failed  && goto :failure 
cd

yields this result

c:\kevinransom\visualfsharp>pushd c:\temp

c:\temp>cd
c:\temp

c:\temp>c:\kevinransom\visualfsharp\tools\dotnetcli\dotnet restore project.json
error: project.json

c:\temp>popd

c:\kevinransom\visualfsharp>if ERRORLEVEL 1 echo Error: dotnet publish failed    && goto :failure
Error: dotnet publish failed
The system cannot find the batch label specified - failure

c:\kevinransom\visualfsharp>

Copy link
Member

@brettfo brettfo Nov 4, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, learn something new every day.

pushd .\lkg\fsi & %_dotnetexe% restore & popd & if ERRORLEVEL 1 echo Error:%errorlevel% dotnet restore failed & goto :failure
pushd .\lkg\fsc & %_dotnetexe% publish project.json --no-build -o %~dp0\Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed & goto :failure
pushd .\lkg\fsi & %_dotnetexe% publish project.json --no-build -o %~dp0\Tools\lkg -r win7-x64 & popd & if ERRORLEVEL 1 echo Error: dotnet publish failed & goto :failure

echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
%_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj
Expand Down Expand Up @@ -512,7 +511,6 @@ if '%BUILD_PROTO%' == '1' (
)



echo ---------------- Done with proto, starting build ------------------------

if '%BUILD_PHASE%' == '1' (
Expand Down Expand Up @@ -573,15 +571,15 @@ setlocal disableDelayedExpansion
if "%INCLUDE_TEST_SPEC_NUNIT%" == "" (
if NOT "%EXCLUDE_TEST_SPEC_NUNIT%" == "" (
set WHERE_ARG_NUNIT=--where "!(%EXCLUDE_TEST_SPEC_NUNIT%)"
)
)
)
if NOT "%INCLUDE_TEST_SPEC_NUNIT%" == "" (
if "%EXCLUDE_TEST_SPEC_NUNIT%" == "" (
set WHERE_ARG_NUNIT=--where "%INCLUDE_TEST_SPEC_NUNIT%"
)
)
if NOT "%EXCLUDE_TEST_SPEC_NUNIT%" == "" (
set WHERE_ARG_NUNIT=--where "%INCLUDE_TEST_SPEC_NUNIT% and !(%EXCLUDE_TEST_SPEC_NUNIT%)"
)
set WHERE_ARG_NUNIT=--where "%INCLUDE_TEST_SPEC_NUNIT% and !(%EXCLUDE_TEST_SPEC_NUNIT%)"
)
)
if NOT "%INCLUDE_TEST_TAGS%" == "" (
set INCLUDE_ARG_RUNALL=-ttags:%INCLUDE_TEST_TAGS%
Expand Down
0 lkg/NuGet.Config → lkg/fsc/NuGet.Config
View file
Open in desktop
File renamed without changes.
31 changes: 31 additions & 0 deletions lkg/fsc/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": "1.0.0-*",
"name": "fsc",
"buildOptions": {
"debugType": "portable",
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-161102",
},
"runtimes": {
"win7-x86": { },
"win7-x64": { },
"osx.10.10-x64": { },
"ubuntu.14.04-x64": { }
},
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
}
},
"imports": "dnxcore50"
}
},
"scripts": {
"postpublish": [ "cmd /c copy %publish:OutputPath%\\runtimes\\any\\native\\* %publish:OutputPath%" ]
}
}
13 changes: 13 additions & 0 deletions lkg/fsi/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>

<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
<add key="dotnet-core" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />

</packageSources>
</configuration>
31 changes: 31 additions & 0 deletions lkg/fsi/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": "1.0.0-*",
"name": "fsi",
"buildOptions": {
"debugType": "portable",
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-161102",
},
"runtimes": {
"win7-x86": { },
"win7-x64": { },
"osx.10.10-x64": { },
"ubuntu.14.04-x64": { }
},
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.1"
}
},
"imports": "dnxcore50"
}
},
"scripts": {
"postpublish": [ "cmd /c copy %publish:OutputPath%\\runtimes\\any\\native\\* %publish:OutputPath%" ]
}
}
20 changes: 0 additions & 20 deletions lkg/project.json
View file
Open in desktop

This file was deleted.