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

#1175 - NetStandard #1269

Merged
merged 90 commits into from
Jun 28, 2018
Merged

#1175 - NetStandard #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
120d8b6
#1175 - First pass at GitVersionCore on netstadard - wip.
dazinator Jul 29, 2017
75b4e2b
Fixes #1278 - ContinuaCI use environment variable not registry.
dazinator Aug 16, 2017
87ecbb7
#1271 Allow branch names starting with master
Jul 31, 2017
63f1028
Added Octopus Deploy to list
peterneave Aug 10, 2017
f0265ec
Merge branch 'master' into feature/netstandard
dazinator Aug 16, 2017
67ed186
Worked around absent GetEncodings APi for NetStandard. Tried to switc…
dazinator Aug 16, 2017
309a30c
Down to one build error.
dazinator Aug 16, 2017
8d56e23
Fixed up some tests. Haven't been able to run them yet!
dazinator Aug 16, 2017
b41fc58
gitversiontask building again for net40.
dazinator Aug 17, 2017
6515fc9
Forward integration with master.
dazinator Aug 17, 2017
2e482dd
Upgraded yamldotnet, removed remaining system.web references, and swi…
dazinator Aug 17, 2017
123d73b
Upgraded GitVersionTask csproj to new vs2017 format.
dazinator Aug 17, 2017
0547a2f
Fixed remaining tests.
dazinator Aug 17, 2017
1d69a92
Upgraded tests project files to sdk style.
dazinator Sep 23, 2017
a48c1ba
forward integration with master
dazinator Oct 23, 2017
42d253e
Forward integration (resolved merge conflicts), all tests passing.
dazinator Oct 24, 2017
589786a
First attempt at getting GitVersion task to run via UtilPack.
dazinator Oct 24, 2017
011441b
Including all dependencies in task nuget package.
dazinator Oct 24, 2017
8ebbc79
Updated util pack to version that handles native assembly resolution …
dazinator Oct 31, 2017
ccd1ec1
dotnet build working
dazinator Oct 31, 2017
7cf8df2
Added missing props file.
dazinator Oct 31, 2017
7118c19
Added missing targets and props files.
dazinator Oct 31, 2017
ebcc1ab
Update appveyor build image.
dazinator Oct 31, 2017
32d556b
cake script to use vs2017 tools version.
dazinator Oct 31, 2017
b74a79e
Updated gitignore to include cake package config.
dazinator Oct 31, 2017
e53776b
added cake.config
dazinator Nov 3, 2017
b819f48
Fixed up some paths in cake script.
dazinator Nov 3, 2017
4fc440e
reset AssemblyInfoFileUpdaterTests.
Nov 7, 2017
6d46e03
Removed attempt at setting content-length header as causing exception.
Nov 7, 2017
2e4cc16
Removed another instance of setting content length
Nov 7, 2017
6383fd4
Updated cake to version 0.22.2
Nov 8, 2017
374a1f7
Treid to switch tests to dotnettest to resolve issue with some tests …
Nov 8, 2017
856d3f0
Attempt at fixing cake CI build issue.
dazinator Dec 29, 2017
5496bc1
Corrected typo in cake script.
dazinator Dec 29, 2017
e0a0b6f
Attempt to use more detailed msbuild output via cake CI build.
dazinator Dec 29, 2017
2604a33
Changed cake msbuild verbosity to verbose.
dazinator Dec 29, 2017
123a28c
Trying diagnostic msbuild output as Detailed didn't work.
dazinator Dec 29, 2017
9e169b3
Added global.json to pin netcore sdk to version 2.0.0
dazinator Dec 29, 2017
eecdff7
Added change missed from previous push..
dazinator Dec 29, 2017
09949e3
Merge branch 'master' into feature/netstandard
dazinator Jan 23, 2018
95e3d09
#1269 - forward integration with master including gitpreparer changes.
dazinator Jan 23, 2018
8713f12
#1269 - switch back to nunit console runner
dazinator Jan 23, 2018
505d320
#1363 - Moved some packaging logic to cake.
dazinator Jan 24, 2018
0bf5d63
#1363 - Moved GitVersionCore packaging logic into cake
dazinator Jan 24, 2018
677848e
#1363 - Moved GitVersion task packaging logic to cake.
dazinator Jan 24, 2018
7596c10
Corrected case sensitive typo in cake script.
dazinator Jan 24, 2018
870d59b
Fixe package version cake script problem
dazinator Jan 24, 2018
7a062dc
Updated utilpack dependency.
Jan 25, 2018
314bbf2
Updated nuspec, corrected util pack version.
Jan 25, 2018
cdc628c
Fix for props path on linux.
dazinator Mar 10, 2018
81880c5
Forward integration with master - new msbuild hook for package version
dazinator Mar 10, 2018
6e56f49
Commented out upload of vsix and gem in order to get build working.
dazinator Mar 10, 2018
71c102e
Fixed props file util pack version typo. Have to be careful of this.
dazinator Mar 10, 2018
68eaa03
Improved package versioning for util pack and some other dependencies.
dazinator Mar 10, 2018
66ad78d
Set dependency versions in nuspec automatically during build.
dazinator Mar 10, 2018
c650925
Removed costura embedding from GitVersionTask.
dazinator Mar 11, 2018
ce17826
Fix for task not awaited.
dazinator Mar 11, 2018
92ed30d
Added yamldotnet dependency to nuspec.
dazinator Mar 11, 2018
a1a27d8
GitVersionTask - allow auto generate of assembly attributes.
dazinator Mar 11, 2018
a684754
GitVersion task fix when targeting < netstandard1.5
dazinator Mar 12, 2018
9792af2
Gitversion.exe builds for netstandard20
dazinator Mar 17, 2018
385861d
Added docker files to sln.
dazinator Mar 17, 2018
c6e827b
Fixed tests.
dazinator Mar 17, 2018
91536c1
Fix tests after removing fody module init.
dazinator Mar 17, 2018
b4d18e6
Cake build now uses dotnet sdk.
dazinator Mar 17, 2018
acc05c9
New build artifact - GitVersion.CommandLine.DotNetCore..
dazinator Mar 17, 2018
ad47e39
Added dotnet core docker image to build.
dazinator Mar 19, 2018
784660a
Update travis.yml to add dotnet sdk.
Apr 5, 2018
1613cb3
Reverted a change to cake script to keep using nunit console runner.
Apr 5, 2018
6abb463
Forward integration with master ans resolved issues.
Apr 5, 2018
714342e
Updated dotnet sdk to 2.1.4
Apr 5, 2018
20f13ab
Cake update to get fix: https://github.com/cake-build/cake/issues/2063
Apr 5, 2018
22484ed
Try mono 5.4
Apr 5, 2018
404fde6
Try mono 5.4.0.201
Apr 5, 2018
48cea45
Change mono to 5.4.2
Apr 5, 2018
cd83398
Change mono on travis to 5.4.1
Apr 5, 2018
8327129
Add in dotnet sdk env var for telemetry optout etc.
Apr 5, 2018
566d383
try mono 5.2.0
Apr 5, 2018
085896a
Added mono 5.4.0 to travis
Apr 5, 2018
f1141e6
Try dotnet core sdk 2.1.103
Apr 5, 2018
3cebff4
Cahged cake to diagnostic verbosity.
Apr 6, 2018
cfe2711
Fix for deserializing DateTimeOffset. (Bug in YAML.net)
Farthom May 9, 2018
a430872
Merge pull request #1 from Farthom/feature/netstandard
dazinator May 9, 2018
367e791
Fix for GitVersionCore.Tests.csproj not using common shared package v…
Farthom May 9, 2018
f0d2852
Merge branch 'feature/netstandard' of https://github.com/dazinator/Gi…
Farthom May 9, 2018
a376842
Merge pull request #2 from Farthom/feature/netstandard
dazinator May 9, 2018
f770d40
updated Shouldly
May 23, 2018
33c1519
update cake to 0.27.2, remove travis cache, using MSBuild instead of …
May 23, 2018
835493e
running the tests using dotnet test
May 24, 2018
4a5356b
Merge pull request #4 from arturcic/feature/netstandard
dazinator May 27, 2018
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
6 changes: 4 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,10 @@ src/GitVersionTfsTask/*.js
####################
# Cake
####################
/tools
tools/*
!tools/packages.config
/*.zip
GitVersion.CommandLine/*/

releaseArtifacts
releaseArtifacts
/ILMergeTemp
16 changes: 9 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
language: csharp
sudo: false
sudo: required
dist: trusty
dotnet: 2.1.105
mono:
- latest
os:
- linux
- osx
before_install:
- git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags
- git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags
script:
- ./build.sh
cache:
directories:
- src/packages
- tools
- ./build.sh -v Diagnostic
env:
global:
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1 change: 1 addition & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
image: Visual Studio 2017
install:
npm i -g tfx-cli

Expand Down
Loading