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.

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

Create a github build with updated tools. #182

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,16 @@
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.3",
"version": "9.0.2",
"commands": [
"paket"
],
"rollForward": false
]
},
"fake-cli": {
"version": "6.1.1",
"version": "6.1.3",
"commands": [
"fake"
],
"rollForward": false
]
}
}
}
45 changes: 45 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: CI Build

env:
# Stop wasting time caching packages
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
# Disable sending usage data to Microsoft
DOTNET_CLI_TELEMETRY_OPTOUT: true

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: windows-latest
permissions:
packages: write
contents: read

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
- name: Restore
run: dotnet tool restore
- name: Build
run: dotnet build -c Release
- name: Test
run: dotnet test --no-build -c Release tests
- name: Pack
run: dotnet pack --no-restore -c Release --include-symbols -o bin
- name: Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: nupkg-${{ matrix.runs-on }}
path: ./bin/*nupkg
36 changes: 36 additions & 0 deletions .github/workflows/private-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Private Publish

env:
# Stop wasting time caching packages
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
# Disable sending usage data to Microsoft
DOTNET_CLI_TELEMETRY_OPTOUT: true

on:
workflow_dispatch:

jobs:
build:

runs-on: windows-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
- name: Restore
run: dotnet tool restore
- name: Build
run: dotnet build -c Release
- name: Test
run: dotnet test --no-build -c Release tests
- name: Pack
run: dotnet pack -c Release --include-symbols -o bin
- name: Push Package to Local Feed
run: dotnet nuget push bin\*.nupkg -s https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json -k ${{ secrets.GITHUB_TOKEN }}
36 changes: 36 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: NuGet Publish

env:
# Stop wasting time caching packages
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
# Disable sending usage data to Microsoft
DOTNET_CLI_TELEMETRY_OPTOUT: true

on:
workflow_dispatch:

jobs:
build:

runs-on: windows-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
8.0.x
- name: Restore
run: dotnet tool restore
- name: Build
run: dotnet build -c Release
- name: Test
run: dotnet test --no-build -c Release tests
- name: Pack
run: dotnet pack --no-build -c Release --include-symbols -o bin
- name: Push Package to NuGet.org
run: dotnet nuget push bin\*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_KEY }}
9 changes: 7 additions & 2 deletions .paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,15 @@
<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
</PaketReferencesFileLinesInfo>
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
Expand All @@ -252,6 +253,10 @@
<AllowExplicitVersion>true</AllowExplicitVersion>

</PackageReference>

<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
</PackageVersion>
</ItemGroup>

<PropertyGroup>
Expand Down
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

2 changes: 0 additions & 2 deletions FSharp.Control.Reactive.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{8961FBE9-1BE3-4A44-9610-5B4386DC5848}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
.travis.yml = .travis.yml
appveyor.yml = appveyor.yml
build.cmd = build.cmd
build.fsx = build.fsx
build.sh = build.sh
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
F# wrappers for the [Reactive Extensions (Rx)](http://msdn.microsoft.com/en-us/data/gg577609.aspx)

[![NuGet Status](http://img.shields.io/nuget/v/FSharp.Control.Reactive.svg?style=flat)](https://www.nuget.org/packages/FSharp.Control.Reactive/)
[![Build status](https://ci.appveyor.com/api/projects/status/12euia5l32c7prk7/branch/master)](https://ci.appveyor.com/project/panesofglass/fsharp-control-reactive/branch/master)
[![Build Status](https://travis-ci.org/fsprojects/FSharp.Control.Reactive.svg?branch=master)](https://travis-ci.org/fsprojects/FSharp.Control.Reactive)
[[![CI Build](https://github.com/fsprojects/FSharp.Control.Reactive/actions/workflows/build.yml/badge.svg)](https://github.com/fsprojects/FSharp.Control.Reactive/actions/workflows/build.yml)

## Maintainer(s)

Expand Down
20 changes: 0 additions & 20 deletions appveyor.yml

This file was deleted.

22 changes: 2 additions & 20 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
[xml]$doc = Get-Content .\src\Directory.Build.props
$version = $doc.Project.PropertyGroup.VersionPrefix # the version under development, update after a release
$versionSuffix = '-build.0' # manually incremented for local builds

function isVersionTag($tag){
$v = New-Object Version
[Version]::TryParse($tag, [ref]$v)
}

if ($env:appveyor){
$versionSuffix = '-build.' + $env:appveyor_build_number
if ($env:appveyor_repo_tag -eq 'true' -and (isVersionTag($env:appveyor_repo_tag_name))){
$version = $env:appveyor_repo_tag_name
$versionSuffix = ''
}
Update-AppveyorBuild -Version "$version$versionSuffix"
}

dotnet tool restore
dotnet build -c Release /p:Version=$version$versionSuffix
dotnet build -c Release
dotnet test --no-build -c Release tests
dotnet pack --no-restore -c Release /p:Version=$version$versionSuffix -o $psscriptroot/bin
dotnet pack --no-restore -c Release --include-symbols -o $psscriptroot/bin
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.200",
"version": "8.0.400",
"rollForward": "latestFeature"
}
}
2 changes: 2 additions & 0 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ nuget NUnit.Runners
nuget NUnit3TestAdapter
nuget FsCheck
nuget Unquote
nuget GitVersion.MsBuild copy_local:true
nuget Microsoft.SourceLink.GitHub copy_local: true

// [ FAKE GROUP ]
group Build
Expand Down
12 changes: 9 additions & 3 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ NUGET
System.ValueTuple (>= 4.4) - restriction: || (== net472) (&& (== net6.0) (>= net45)) (&& (== netstandard2.0) (>= net45))
FsCheck (2.16.6)
FSharp.Core (>= 4.2.3)
FSharp.Core (8.0.400)
FSharp.Core (6.0.7)
GitVersion.MsBuild (6.1) - copy_local: true
Microsoft.Build.Tasks.Git (8.0) - copy_local: true
Microsoft.CodeCoverage (17.11.1) - restriction: || (== net472) (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
Microsoft.NET.Test.Sdk (17.11.1)
Microsoft.CodeCoverage (>= 17.11.1) - restriction: || (== net472) (== net6.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= netcoreapp3.1))
Expand All @@ -17,6 +19,10 @@ NUGET
Microsoft.Reactive.Testing (6.0.1)
System.Reactive (>= 6.0.1)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
Microsoft.SourceLink.Common (8.0) - copy_local: true
Microsoft.SourceLink.GitHub (8.0) - copy_local: true
Microsoft.Build.Tasks.Git (>= 8.0)
Microsoft.SourceLink.Common (>= 8.0)
Microsoft.TestPlatform.ObjectModel (17.11.1) - restriction: || (&& (== net472) (>= netcoreapp3.1)) (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
System.Reflection.Metadata (>= 1.6)
Microsoft.TestPlatform.TestHost (17.11.1) - restriction: || (&& (== net472) (>= netcoreapp3.1)) (== net6.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
Expand Down Expand Up @@ -53,8 +59,8 @@ NUGET
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (== net472) (&& (== net6.0) (>= net472)) (&& (== net6.0) (>= uap10.1)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net472) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.0)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= wp8)) (== netstandard2.0)
System.ValueTuple (4.5) - restriction: || (== net472) (&& (== net6.0) (>= net45)) (&& (== netstandard2.0) (>= net45))
Unquote (7.0)
FSharp.Core (>= 8.0.100)
Unquote (7.0.1)
FSharp.Core (>= 6.0)

GROUP Build
NUGET
Expand Down
8 changes: 5 additions & 3 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>6.0.0</VersionPrefix>
<Authors>Ryan Riley;Steffen Forkmann;Jared Hester</Authors>
<Summary>A F#-friendly wrapper for the Reactive Extensions.</Summary>
<Description>A F#-friendly wrapper for the Reactive Extensions.</Description>
Expand All @@ -12,18 +11,21 @@
<RepositoryUrl>https://github.com/fsprojects/FSharp.Control.Reactive</RepositoryUrl>
<GenerateDocumentationFile>true</GenerateDocumentationFile>

<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

<!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>

<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
<EmbedUntrackedSources>true</EmbedUntrackedSources>

<!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>symbols.nupkg</SymbolPackageFormat>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>

</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<None Include="..\..\docs\files\img\logo.png" Pack="true" PackagePath="\" />
<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\" />
</ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/FSharp.Control.Reactive.Testing/paket.references
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ System.Reactive
Microsoft.Reactive.Testing
FsCheck
fparsec
Unquote
Unquote
GitVersion.MSBuild
Microsoft.SourceLink.GitHub
2 changes: 2 additions & 0 deletions src/FSharp.Control.Reactive/paket.references
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
FSharp.Core
System.Reactive
GitVersion.MSBuild
Microsoft.SourceLink.GitHub