Skip to content

GitLink - source code location. #18

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

Merged
merged 3 commits into from
Aug 9, 2017
Merged

GitLink - source code location. #18

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
d4588ed
GitLink - source code location.
jthelin Aug 9, 2017
a558ad1
Use msbuild for travis-ci rather than old xbuild.
jthelin Aug 9, 2017
3cab343
Only run GitLink in Windows builds due to bug[s] on travis-ci builds.
jthelin Aug 9, 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
2 changes: 1 addition & 1 deletion Build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#/usr/bin/bash

xbuild ServerHost.sln
msbuild ServerHost.sln

4 changes: 2 additions & 2 deletions ServerHost.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package >
<metadata>
<id>ServerHost</id>
<version>1.1.3</version>
<version>1.1.4</version>
<authors>Jorgen Thelin</authors>
<owners>Jorgen Thelin</owners>
<licenseUrl>https://github.com/jthelin/ServerHost/blob/master/LICENSE</licenseUrl>
<projectUrl>https://github.com/jthelin/ServerHost</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>ServerHost - A .NET Server Hosting utility library, including in-process server host testing.</description>
<releaseNotes>Release note are on GitHub https://github.com/jthelin/ServerHost/releases</releaseNotes>
<copyright>Copyright 2015-2016</copyright>
<copyright>Copyright 2015-2017</copyright>
<tags>DotNet Server Host</tags>
<dependencies>
<dependency id="log4net" version="2.0.5" />
Expand Down
2 changes: 1 addition & 1 deletion ServerHost.xunit/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Jorgen Thelin")]
[assembly: AssemblyProduct("ServerHost")]
[assembly: AssemblyCopyright("Copyright © Jorgen Thelin 2015-2016")]
[assembly: AssemblyCopyright("Copyright © Jorgen Thelin 2015-2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
9 changes: 9 additions & 0 deletions ServerHost.xunit/ServerHost.xunit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.props') and '$(OS)' == 'Windows_NT' " />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -45,6 +46,14 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.props') and '$(OS)' == 'Windows_NT' " Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.props'))" />
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.targets') and '$(OS)' == 'Windows_NT' " Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.targets'))" />
</Target>
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.targets" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.targets') and '$(OS)' == 'Windows_NT' " />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
1 change: 1 addition & 0 deletions ServerHost.xunit/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GitLink" version="3.0.0" targetFramework="net45" developmentDependency="true" />
<package id="log4net" version="2.0.5" targetFramework="net45" />
</packages>
2 changes: 1 addition & 1 deletion ServerHost/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Jorgen Thelin")]
[assembly: AssemblyProduct("ServerHost")]
[assembly: AssemblyCopyright("Copyright © Jorgen Thelin 2015-2016")]
[assembly: AssemblyCopyright("Copyright © Jorgen Thelin 2015-2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
9 changes: 9 additions & 0 deletions ServerHost/ServerHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.props" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.props') and '$(OS)' == 'Windows_NT' " />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -69,4 +70,12 @@
<Exec Condition="'$(OS)' != 'Windows_NT'"
Command="xsltproc -o ../documentation/$(MSBuildProjectName).md ../documentation/DocFormatter.xsl $(OutDir)/$(MSBuildProjectName).XML" />
</Target>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.props') and '$(OS)' == 'Windows_NT' " Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.props'))" />
<Error Condition="!Exists('..\packages\GitLink.3.0.0\build\GitLink.targets') and '$(OS)' == 'Windows_NT' " Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitLink.3.0.0\build\GitLink.targets'))" />
</Target>
<Import Project="..\packages\GitLink.3.0.0\build\GitLink.targets" Condition="Exists('..\packages\GitLink.3.0.0\build\GitLink.targets') and '$(OS)' == 'Windows_NT' " />
</Project>
1 change: 1 addition & 0 deletions ServerHost/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GitLink" version="3.0.0" targetFramework="net45" developmentDependency="true" />
<package id="log4net" version="2.0.5" targetFramework="net45" />
</packages>