Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
.net core 2.0 etc
  • Loading branch information
jbogard committed Aug 21, 2017
1 parent 15b8136 commit 556066b
Show file tree
Hide file tree
Showing 28 changed files with 278 additions and 212 deletions.
57 changes: 57 additions & 0 deletions Backup/HtmlTags.sln
@@ -0,0 +1,57 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3FCD9D5F-200F-4FDC-A1DC-CC6474D0CCFE}"
ProjectSection(SolutionItems) = preProject
.gitattributes = .gitattributes
.gitignore = .gitignore
appveyor.yml = appveyor.yml
Build.ps1 = Build.ps1
global.json = global.json
NuGet.config = NuGet.config
..\readme.md = ..\readme.md
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags", "src\HtmlTags\HtmlTags.xproj", "{7315F16E-1B02-4593-8A9D-F053A4429CB7}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags.Testing", "test\HtmlTags.Testing\HtmlTags.Testing.xproj", "{2576F9D6-A18B-484B-8FC3-FD2746FBB357}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags.AspNetCore", "src\HtmlTags.AspNetCore\HtmlTags.AspNetCore.xproj", "{26DC614B-378B-4023-A366-0BAD79699A86}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags.AspNetCore.Testing", "test\HtmlTags.AspNetCore.Testing\HtmlTags.AspNetCore.Testing.xproj", "{768EA12F-08D7-415F-90F1-C256ABD86A5C}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags.AspNetCore.TestSite", "src\HtmlTags.AspNetCore.TestSite\HtmlTags.AspNetCore.TestSite.xproj", "{B84942B7-D1E6-4511-8E3B-FBE1137EED09}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7315F16E-1B02-4593-8A9D-F053A4429CB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7315F16E-1B02-4593-8A9D-F053A4429CB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7315F16E-1B02-4593-8A9D-F053A4429CB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7315F16E-1B02-4593-8A9D-F053A4429CB7}.Release|Any CPU.Build.0 = Release|Any CPU
{2576F9D6-A18B-484B-8FC3-FD2746FBB357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2576F9D6-A18B-484B-8FC3-FD2746FBB357}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2576F9D6-A18B-484B-8FC3-FD2746FBB357}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2576F9D6-A18B-484B-8FC3-FD2746FBB357}.Release|Any CPU.Build.0 = Release|Any CPU
{26DC614B-378B-4023-A366-0BAD79699A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26DC614B-378B-4023-A366-0BAD79699A86}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26DC614B-378B-4023-A366-0BAD79699A86}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26DC614B-378B-4023-A366-0BAD79699A86}.Release|Any CPU.Build.0 = Release|Any CPU
{768EA12F-08D7-415F-90F1-C256ABD86A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{768EA12F-08D7-415F-90F1-C256ABD86A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{768EA12F-08D7-415F-90F1-C256ABD86A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{768EA12F-08D7-415F-90F1-C256ABD86A5C}.Release|Any CPU.Build.0 = Release|Any CPU
{B84942B7-D1E6-4511-8E3B-FBE1137EED09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B84942B7-D1E6-4511-8E3B-FBE1137EED09}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B84942B7-D1E6-4511-8E3B-FBE1137EED09}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B84942B7-D1E6-4511-8E3B-FBE1137EED09}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
46 changes: 11 additions & 35 deletions Build.ps1
@@ -1,29 +1,3 @@
<#
.SYNOPSIS
You can add this to you build script to ensure that psbuild is available before calling
Invoke-MSBuild. If psbuild is not available locally it will be downloaded automatically.
#>
function EnsurePsbuildInstalled{
[cmdletbinding()]
param(
[string]$psbuildInstallUri = 'https://raw.githubusercontent.com/ligershark/psbuild/master/src/GetPSBuild.ps1'
)
process{
if(-not (Get-Command "Invoke-MsBuild" -errorAction SilentlyContinue)){
'Installing psbuild from [{0}]' -f $psbuildInstallUri | Write-Verbose
(new-object Net.WebClient).DownloadString($psbuildInstallUri) | iex
}
else{
'psbuild already loaded, skipping download' | Write-Verbose
}

# make sure it's loaded and throw if not
if(-not (Get-Command "Invoke-MsBuild" -errorAction SilentlyContinue)){
throw ('Unable to install/load psbuild from [{0}]' -f $psbuildInstallUri)
}
}
}

# Taken from psake https://github.com/psake/psake

<#
Expand All @@ -50,19 +24,21 @@ function Exec

if(Test-Path .\artifacts) { Remove-Item .\artifacts -Force -Recurse }

EnsurePsbuildInstalled
$branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL];
$revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"]
$commitHash = $(git rev-parse --short HEAD)
$buildSuffix = @{ $true = "$($suffix)-$($commitHash)"; $false = "$($branch)-$($commitHash)" }[$suffix -ne ""]
$versionSuffix = @{ $true = "--version-suffix=$($suffix)"; $false = ""}[$suffix -ne ""]

exec { & dotnet restore }

& Invoke-MSBuild

$revision = @{ $true = $env:APPVEYOR_BUILD_NUMBER; $false = 1 }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
$revision = "{0:D4}" -f [convert]::ToInt32($revision, 10)
exec { & dotnet build -c Release --version-suffix=$buildSuffix -v q /nologo }

exec { & dotnet pack .\src\HtmlTags -c Release -o .\artifacts --version-suffix=$revision }
exec { & dotnet pack .\src\HtmlTags.AspNetCore -c Release -o .\artifacts --version-suffix=$revision }
exec { & dotnet test .\test\HtmlTags.Testing -c Release --no-build }
exec { & dotnet test .\test\HtmlTags.AspNetCore.Testing -c Release --no-build }

exec { & dotnet test .\test\HtmlTags.Testing -c Release }
exec { & dotnet test .\test\HtmlTags.AspNetCore.Testing -c Release }
exec { & dotnet pack .\src\HtmlTags -c Release --no-build -o .\artifacts --include-symbols $versionSuffix }
exec { & dotnet pack .\src\HtmlTags.AspNetCore -c Release --no-build -o .\artifacts --include-symbols $versionSuffix }


18 changes: 10 additions & 8 deletions HtmlTags.sln
@@ -1,28 +1,27 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26730.8
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3FCD9D5F-200F-4FDC-A1DC-CC6474D0CCFE}"
ProjectSection(SolutionItems) = preProject
.gitattributes = .gitattributes
.gitignore = .gitignore
appveyor.yml = appveyor.yml
Build.ps1 = Build.ps1
global.json = global.json
NuGet.config = NuGet.config
..\readme.md = ..\readme.md
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags", "src\HtmlTags\HtmlTags.xproj", "{7315F16E-1B02-4593-8A9D-F053A4429CB7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlTags", "src\HtmlTags\HtmlTags.csproj", "{7315F16E-1B02-4593-8A9D-F053A4429CB7}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags.Testing", "test\HtmlTags.Testing\HtmlTags.Testing.xproj", "{2576F9D6-A18B-484B-8FC3-FD2746FBB357}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlTags.Testing", "test\HtmlTags.Testing\HtmlTags.Testing.csproj", "{2576F9D6-A18B-484B-8FC3-FD2746FBB357}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags.AspNetCore", "src\HtmlTags.AspNetCore\HtmlTags.AspNetCore.xproj", "{26DC614B-378B-4023-A366-0BAD79699A86}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlTags.AspNetCore", "src\HtmlTags.AspNetCore\HtmlTags.AspNetCore.csproj", "{26DC614B-378B-4023-A366-0BAD79699A86}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags.AspNetCore.Testing", "test\HtmlTags.AspNetCore.Testing\HtmlTags.AspNetCore.Testing.xproj", "{768EA12F-08D7-415F-90F1-C256ABD86A5C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlTags.AspNetCore.Testing", "test\HtmlTags.AspNetCore.Testing\HtmlTags.AspNetCore.Testing.csproj", "{768EA12F-08D7-415F-90F1-C256ABD86A5C}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "HtmlTags.AspNetCore.TestSite", "src\HtmlTags.AspNetCore.TestSite\HtmlTags.AspNetCore.TestSite.xproj", "{B84942B7-D1E6-4511-8E3B-FBE1137EED09}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HtmlTags.AspNetCore.TestSite", "src\HtmlTags.AspNetCore.TestSite\HtmlTags.AspNetCore.TestSite.csproj", "{B84942B7-D1E6-4511-8E3B-FBE1137EED09}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -54,4 +53,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B5373CC7-6315-4A8F-A934-564C942A1374}
EndGlobalSection
EndGlobal
Binary file added UpgradeLog.htm
Binary file not shown.
1 change: 1 addition & 0 deletions appveyor.yml
Expand Up @@ -4,6 +4,7 @@ pull_requests:
branches:
only:
- master
image: Visual Studio 2017
nuget:
disable_publish_on_pr: true
build_script:
Expand Down
@@ -0,0 +1,45 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>HtmlTags.AspNetCore.TestSite</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>HtmlTags.AspNetCore.TestSite</PackageId>
</PropertyGroup>

<ItemGroup>
<None Update="wwwroot\**\*;Views\**\*;Areas\**\Views">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</None>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\HtmlTags.AspNetCore\HtmlTags.AspNetCore.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
</ItemGroup>

<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
<Exec Command="bower install" />
<Exec Command="dotnet bundle" />
</Target>

<ItemGroup>
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.4.337" />
</ItemGroup>

</Project>
33 changes: 33 additions & 0 deletions src/HtmlTags.AspNetCore/HtmlTags.AspNetCore.csproj
@@ -0,0 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Easy generation of html with a jquery inspired object model</Description>
<Copyright>Copyright 2008-2016 Jeremy D. Miller, Josh Arnold, Joshua Flanagan, et al. All rights reserved.</Copyright>
<VersionPrefix>5.0.0</VersionPrefix>
<Authors>Jeremy D. Miller;Joshua Flanagan;Josh Arnold</Authors>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);ASPNETCORE</DefineConstants>
<AssemblyName>HtmlTags.AspNetCore</AssemblyName>
<PackageId>HtmlTags.AspNetCore</PackageId>
<PackageTags>html;ASP.NET MVC</PackageTags>
<PackageIconUrl>https://raw.githubusercontent.com/HtmlTags/htmltags/master/logo/FubuHtml_256.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/HtmlTags/htmltags</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/HtmlTags/htmltags/raw/master/license.txt</PackageLicenseUrl>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<Compile Remove="..\HtmlTags\obj\**\*.cs" />
<Compile Include="..\HtmlTags\**\*.cs" Exclude="..\HtmlTags\obj\**\*.cs;bin\**;obj\**;**\*.xproj;packages\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.0.0" />
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
</ItemGroup>
</Project>
Binary file not shown.
Binary file not shown.

0 comments on commit 556066b

Please sign in to comment.