Skip to content
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

Build setup in AppVeyor/Jenkins #1575

Merged
merged 3 commits into from
Oct 4, 2016
Merged

Build setup in AppVeyor/Jenkins #1575

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
726afc7
Pull swix plugin from myget
Sep 29, 2016
6738619
Copy MSIs to insertion folder regardless of signing
Sep 29, 2016
705e8e4
Using newer version of swixbuild nuget
Sep 29, 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
1 change: 1 addition & 0 deletions .nuget/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
<add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="vctools" value="https://vcppdogfooding.azurewebsites.net/nuget/" />
</packageSources>
Expand Down
3 changes: 3 additions & 0 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ if /i '%ARG%' == 'all' (
set BUILD_CORECLR=1
set BUILD_PORTABLE=1
set BUILD_VS=1
set BUILD_SETUP=1

set TEST_COMPILERUNIT=1
set TEST_NET40_COREUNIT=1
Expand Down Expand Up @@ -142,6 +143,7 @@ if /i '%ARG%' == 'ci' (
set BUILD_CORECLR=1
set BUILD_PORTABLE=1
set BUILD_VS=1
set BUILD_SETUP=1

set TEST_COMPILERUNIT=1
set TEST_NET40_COREUNIT=1
Expand All @@ -162,6 +164,7 @@ if /i '%ARG%' == 'ci_part1' (
set BUILD_CORECLR=0
set BUILD_PORTABLE=1
set BUILD_VS=1
set BUILD_SETUP=1

set TEST_COMPILERUNIT=1
set TEST_NET40_COREUNIT=0
Expand Down
2 changes: 2 additions & 0 deletions packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<package id="Microsoft.DiaSymReader" version="1.0.8" />
<package id="FsSrGen" version="2.0.0" targetFramework="net46" />
<package id="MicroBuild.Core" version="0.2.0" />
<package id="MicroBuild.Core.Sentinel" version="1.0.0" />
<package id="MicroBuild.Plugins.SwixBuild" version="1.0.43" />
<package id="WiX.Toolset.2015" version="3.10.0.1503" />
<package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
<package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion setup/FSharp.SDK/FSharp.SDK.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
</Target>

<Target Name="CopyMsiToInsertionFolder" AfterTargets="SignFiles">
<Target Name="CopyMsiToInsertionFolder" AfterTargets="Build">
<ItemGroup>
<MsiPath Include="$(OutDir)$(OutputName).msi" />
</ItemGroup>
Expand Down