Skip to content

Commit

Permalink
Removing travis, fixing GitHub Actions definitions and adding package…
Browse files Browse the repository at this point in the history
… settings in project file (#164)
  • Loading branch information
matt-lethargic authored Nov 9, 2021
1 parent 5e7b6e0 commit fb75ed5
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 54 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: "Build & Test"

on:
push:
branches: [ main, dev ]
pull_request:
branches: [ main, dev ]

env:
CONFIGURATION: "Release"

jobs:
build:

runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.401'
- name: Clean
run: dotnet clean OpenTok.sln --configuration ${{ env.CONFIGURATION }} && dotnet nuget locals all --clear
- name: Install dependencies
run: dotnet restore
- name: Build
run: dotnet build OpenTok.sln --configuration ${{ env.CONFIGURATION }} --no-restore
- name: Test
run: dotnet test OpenTokTest/OpenTokTest.csproj --configuration ${{ env.CONFIGURATION }} --no-build -f netcoreapp3.1
28 changes: 0 additions & 28 deletions .github/workflows/dotnet-core.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: nexmo/github-actions/nuget-release@main
env:
PROJECT_FILE : OpenTok/OpenTok.csproj
BRANCH: master
BRANCH: main
ORGANIZATION: opentok
REPO: Opentok-.NET-SDK
TAG: ${{ github.event.release.tag_name }}
Expand Down
14 changes: 7 additions & 7 deletions OpenTok.sln
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30114.105
# Visual Studio Version 17
VisualStudioVersion = 17.1.31903.286
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DC02B3EA-F1B3-4A39-A151-4FE61A39F209}"
ProjectSection(SolutionItems) = preProject
.gitattributes = .gitattributes
.gitignore = .gitignore
.travis.yml = .travis.yml
appveyor.yml = appveyor.yml
.github\workflows\build.yml = .github\workflows\build.yml
CONTRIBUTING.md = CONTRIBUTING.md
DEVELOPING.md = DEVELOPING.md
README.md = README.md
.github\workflows\release.yml = .github\workflows\release.yml
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "Samples\HelloWorld\HelloWorld.csproj", "{F8A5A9AD-F680-46F4-806F-653E7E51A030}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld", "Samples\HelloWorld\HelloWorld.csproj", "{F8A5A9AD-F680-46F4-806F-653E7E51A030}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archiving", "Samples\Archiving\Archiving.csproj", "{B6EFF9BA-20CD-4BDE-B67B-C8E22F00E640}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Archiving", "Samples\Archiving\Archiving.csproj", "{B6EFF9BA-20CD-4BDE-B67B-C8E22F00E640}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Broadcasting", "Samples\Broadcasting\Broadcasting.csproj", "{D593D74C-46D3-4947-9F57-B40D978C40B7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Broadcasting", "Samples\Broadcasting\Broadcasting.csproj", "{D593D74C-46D3-4947-9F57-B40D978C40B7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTok", "OpenTok\OpenTok.csproj", "{C770C266-B8E6-413A-B5AB-68EB218DC76C}"
EndProject
Expand Down
8 changes: 7 additions & 1 deletion OpenTok/OpenTok.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net452;net46;net461;netstandard2.0</TargetFrameworks>
<Version>3.6.0</Version>
<Description>OpenTok is an API from TokBox that enables websites to weave live group video communication into their online experience.</Description>
<PackageProjectUrl>https://github.com/opentok/Opentok-.NET-SDK</PackageProjectUrl>
<RepositoryUrl>https://github.com/opentok/Opentok-.NET-SDK</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<PackageReleaseNotes>https://github.com/opentok/Opentok-.NET-SDK/releases/tag/v3.6.0</PackageReleaseNotes>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ProjectGuid>{C770C266-B8E6-413A-B5AB-68EB218DC76C}</ProjectGuid>
<NuGetPackageImportStamp>671ed443</NuGetPackageImportStamp>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Copyright>Copyright © Vonage 2020</Copyright>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<Deterministic>true</Deterministic>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net452|AnyCPU'">
Expand Down
17 changes: 0 additions & 17 deletions OpenTok/OpenTok.nuspec

This file was deleted.

0 comments on commit fb75ed5

Please sign in to comment.