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

Migrate dotnetcore to vs2017 tooling #1567

Merged
merged 35 commits into from
Mar 30, 2017
Merged

Migrate dotnetcore to vs2017 tooling #1567

Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0259cf3
convert to VS2017
ryangribble Mar 12, 2017
8d811e3
rework cake.frosting build to latest cake vs2017 "template" example
ryangribble Mar 12, 2017
55b035e
fix clean task and version suffix
ryangribble Mar 14, 2017
7551ddf
add arg to DotNetCorePack so it uses the correct version
ryangribble Mar 16, 2017
40136ca
fix appveyor
ryangribble Mar 16, 2017
d69a5a2
is there an easier way to test appveyor?
ryangribble Mar 16, 2017
3e89172
ok travis, let's do this
ryangribble Mar 16, 2017
172b546
after reading the travis repo, this seems to be the version we want f…
ryangribble Mar 16, 2017
4ac05a9
msbuild complaining about arguments - we can use defaults anyhow so r…
ryangribble Mar 16, 2017
800a53b
add workaround for msbuild/travis, as mentioned on aspnet Mvc repo
ryangribble Mar 16, 2017
3cf1a44
cmon travis
ryangribble Mar 16, 2017
0d2ee58
perhaps tee isnt needed afterall
ryangribble Mar 16, 2017
48a31b5
travis permission denied when trying to install tools in build script…
ryangribble Mar 16, 2017
1443219
could it be folder permissions of /build ?
ryangribble Mar 16, 2017
0ed0ea2
Try 777 for NuGet.exe permissions rather than 644
ryangribble Mar 23, 2017
8108407
remove windows platform restriction on GitVersion call
ryangribble Mar 28, 2017
6d158fb
Add a wrapper script for GitVersion on non windows
ryangribble Mar 28, 2017
85da23c
fix wrapper script name
ryangribble Mar 28, 2017
d61573f
add debug
ryangribble Mar 28, 2017
1e6ead8
let's see if we are running the script at all!
ryangribble Mar 28, 2017
674236e
run mono gitversion direclty from travis.yml, for science
ryangribble Mar 28, 2017
b8cf445
see if we can run bin/sh and prepend an argument to our shell script
ryangribble Mar 28, 2017
872a37d
remove echos from wrapper script
ryangribble Mar 28, 2017
36c19b6
Ensure full git repo include more than 50 commits and all tags are fe…
ryangribble Mar 28, 2017
b9c89c5
only build netstandard framework on non windows
ryangribble Mar 28, 2017
b4a1c1e
revert overriding the target framework when building the solution
mderriey Mar 28, 2017
6a30371
set FrameworkPathOverride to point to different folders on macOS and …
mderriey Mar 29, 2017
dc269eb
Unix being case-sensitive, adjust app.config file name in csproj files
mderriey Mar 28, 2017
20f55f3
Remove NuGet.exe from the repo.
mderriey Mar 29, 2017
731bd69
tidy up GitVersion logic into a GitVersionRunner class
ryangribble Mar 29, 2017
618fd8c
Merge branch 'dotnetcore-vs2017' of https://github.com/TattsGroup/oct…
ryangribble Mar 29, 2017
a0c0fb1
apply workaround for osx dotnet restore "too many open files" errors
ryangribble Mar 29, 2017
beefc17
update test project references to latest official versions
ryangribble Mar 30, 2017
294dcee
doesnt seem to be a reason for overriding the implicit reference
ryangribble Mar 30, 2017
466d8b9
remove extra whitespace and unused namespace
ryangribble Mar 30, 2017
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
15 changes: 6 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ Generated_Code #added for RIA/Silverlight projects
nunit-*.xml
*.userprefs
packaging/
tools/FAKE.Core
tools/SourceLink.Fake
tools/xunit.runner.console
tools/Octokit.CodeFormatter
tools/FSharp.Data
*.ncrunch*
*.GhostDoc.xml

Expand All @@ -97,11 +92,13 @@ Backup/
*.lock.json

# VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
**/.vscode/*
!**/.vscode/settings.json
!**/.vscode/tasks.json
!**/.vscode/launch.json

# CAKE
.dotnet/*
tools/*
!tools/gitversion_wrapper.sh
!tools/LINQPad
8 changes: 6 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ matrix:
- os: linux
dist: trusty
sudo: required
dotnet: 1.0.0-preview2-003121
dotnet: 1.0.1
- os: osx
osx_image: xcode8
dotnet: 1.0.0-preview2-003121
dotnet: 1.0.1

before_script:
- if test "$TRAVIS_OS_NAME" == "osx"; then export FrameworkPathOverride=/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/; else export FrameworkPathOverride=/usr/lib/mono/4.5/; fi

script:
- git fetch --unshallow --tags
- dotnet --info
- ./build.sh
35 changes: 35 additions & 0 deletions Octokit.Reactive/Octokit.Reactive.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>An IObservable based GitHub API client library for .NET using Reactive Extensions</Description>
<AssemblyTitle>Octokit.Reactive</AssemblyTitle>
<Authors>GitHub</Authors>
<TargetFrameworks>netstandard1.1;net45</TargetFrameworks>
<AssemblyName>Octokit.Reactive</AssemblyName>
<PackageId>Octokit.Reactive</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\SolutionInfo.cs;..\Octokit\Helpers\Ensure.cs;..\Octokit\Helpers\Pagination.cs" />
<None Include="app.config" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Octokit\Octokit.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Reactive" Version="3.1.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

</Project>
19 changes: 0 additions & 19 deletions Octokit.Reactive/Octokit.Reactive.xproj
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions Octokit.Reactive/project.json
View file
Open in desktop

This file was deleted.

45 changes: 45 additions & 0 deletions Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Convention-based tests for Octokit</Description>
<AssemblyTitle>Octokit.Tests.Conventions</AssemblyTitle>
<Authors>GitHub</Authors>
<TargetFramework>netcoreapp1.0</TargetFramework>
<NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
<AssemblyName>Octokit.Tests.Conventions</AssemblyName>
<PackageId>Octokit.Tests.Conventions</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Octokit.Tests\Helpers\AssertEx.cs" />
<None Include="app.config" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<ProjectReference Include="..\Octokit\Octokit.csproj" />
<ProjectReference Include="..\Octokit.Reactive\Octokit.Reactive.csproj" />
<ProjectReference Include="..\Octokit.Tests\Octokit.Tests.csproj" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<DefineConstants>$(DefineConstants);NO_SERIALIZABLE;HAS_TYPEINFO</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems there's a new, stable version of this package on NuGet. Any specific reason to use this pre-release one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just converted the project.json to csproj with VS2017 so I guess this is historic. Ill update it and see how we go!

<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
</ItemGroup>

</Project>
22 changes: 0 additions & 22 deletions Octokit.Tests.Conventions/Octokit.Tests.Conventions.xproj
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions Octokit.Tests.Conventions/project.json
View file
Open in desktop

This file was deleted.

42 changes: 42 additions & 0 deletions Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Integration tests for Octokit</Description>
<AssemblyTitle>Octokit.Tests.Integration</AssemblyTitle>
<Authors>GitHub</Authors>
<TargetFramework>netcoreapp1.0</TargetFramework>
<NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
<AssemblyName>Octokit.Tests.Integration</AssemblyName>
<PackageId>Octokit.Tests.Integration</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Octokit.Tests\Helpers\AssertEx.cs" />
<EmbeddedResource Include="fixtures\hello-world.txt;fixtures\hello-world.zip" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
<None Include="app.config" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<ProjectReference Include="..\Octokit\Octokit.csproj" />
<ProjectReference Include="..\Octokit.Reactive\Octokit.Reactive.csproj" />
<ProjectReference Include="..\Octokit.Tests\Octokit.Tests.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
Copy link
Contributor

Choose a reason for hiding this comment

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

Same as above

<PackageReference Include="xunit" Version="2.2.0-beta5-build3474" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta5-build1225" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions Octokit.Tests.Integration/Octokit.Tests.Integration.xproj
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions Octokit.Tests.Integration/project.json
View file
Open in desktop

This file was deleted.

Loading