Skip to content

Commit aed6752

Browse files
committed
fix build
1 parent a15ef59 commit aed6752

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.vsts-pr.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
_configuration: Release
1212
_testKind: testcoreclr
1313
steps:
14-
- script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) --verbosity normal
14+
- script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind)
1515
- task: PublishBuildArtifacts@1
1616
displayName: Publish Build Logs
1717
inputs:
@@ -55,7 +55,7 @@ jobs:
5555
_configuration: Release
5656
_testKind: testcoreclr
5757
steps:
58-
- script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) --verbosity normal
58+
- script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind)
5959
- task: PublishBuildArtifacts@1
6060
displayName: Publish Build Logs
6161
inputs:

eng/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ usage()
1515
echo "Actions:"
1616
echo " --bootstrap Force the build of the bootstrap compiler"
1717
echo " --restore Restore projects required to build (short: -r)"
18+
echo " --norestore Don't restore projects required to build (short: -r)"
1819
echo " --build Build all projects (short: -b)"
1920
echo " --rebuild Rebuild all projects"
2021
echo " --pack Build nuget packages"
@@ -45,7 +46,7 @@ while [[ -h "$source" ]]; do
4546
done
4647
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
4748

48-
restore=true
49+
restore=false
4950
build=false
5051
rebuild=false
5152
pack=false

proto.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ItemGroup>
99
<Projects Include="src\fsharp\FSharp.Build\FSharp.Build.fsproj">
1010
<AdditionalProperties Condition="'$(OS)' != 'Unix'">TargetFramework=net472</AdditionalProperties>
11-
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netstandard2.0</AdditionalProperties>
11+
<AdditionalProperties Condition="'$(OS)' == 'Unix'">TargetFramework=netcoreapp2.1</AdditionalProperties>
1212
</Projects>
1313
<Projects Include="src\fsharp\fsc\fsc.fsproj">
1414
<AdditionalProperties Condition="'$(OS)' != 'Unix'">TargetFramework=net472</AdditionalProperties>

src/fsharp/FSharp.Build/FSharp.Build.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<PropertyGroup>
66
<OutputType>Library</OutputType>
7-
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
8-
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net472;netcoreapp2.1</TargetFrameworks>
8+
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp2.1</TargetFrameworks>
99
<AssemblyName>FSharp.Build</AssemblyName>
1010
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1111
<AllowCrossTargeting>true</AllowCrossTargeting>

0 commit comments

Comments
 (0)