Skip to content

Commit

Permalink
Merge branch 'release/2.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
FWest98 committed Aug 29, 2016
2 parents 391f3cf + d30b655 commit d1790e3
Show file tree
Hide file tree
Showing 38 changed files with 1,354 additions and 945 deletions.
63 changes: 63 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
261 changes: 260 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,261 @@
.gradle
build
build
*.snk

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
project.fragment.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush
.cr/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
56 changes: 56 additions & 0 deletions HSTS IIS Module.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HSTS IIS Module", "module\HSTS IIS Module.vcxproj", "{62DC9D78-388A-4533-8E57-6678CCE36138}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HSTS IIS Manager", "manager\HSTS IIS Manager.csproj", "{AF5A20AE-292F-4649-A09B-3EF4BDB98951}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "HSTS IIS Installer", "installer\HSTS IIS Installer.wixproj", "{5CAA58C6-D65D-43B4-91CA-0B3A18B5C434}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{62DC9D78-388A-4533-8E57-6678CCE36138}.Debug|Any CPU.ActiveCfg = Debug|Win32
{62DC9D78-388A-4533-8E57-6678CCE36138}.Debug|x64.ActiveCfg = Debug|x64
{62DC9D78-388A-4533-8E57-6678CCE36138}.Debug|x64.Build.0 = Debug|x64
{62DC9D78-388A-4533-8E57-6678CCE36138}.Debug|x86.ActiveCfg = Debug|Win32
{62DC9D78-388A-4533-8E57-6678CCE36138}.Debug|x86.Build.0 = Debug|Win32
{62DC9D78-388A-4533-8E57-6678CCE36138}.Release|Any CPU.ActiveCfg = Release|Win32
{62DC9D78-388A-4533-8E57-6678CCE36138}.Release|x64.ActiveCfg = Release|x64
{62DC9D78-388A-4533-8E57-6678CCE36138}.Release|x64.Build.0 = Release|x64
{62DC9D78-388A-4533-8E57-6678CCE36138}.Release|x86.ActiveCfg = Release|Win32
{62DC9D78-388A-4533-8E57-6678CCE36138}.Release|x86.Build.0 = Release|Win32
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Debug|x64.ActiveCfg = Debug|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Debug|x64.Build.0 = Debug|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Debug|x86.ActiveCfg = Debug|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Debug|x86.Build.0 = Debug|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Release|Any CPU.Build.0 = Release|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Release|x64.ActiveCfg = Release|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Release|x64.Build.0 = Release|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Release|x86.ActiveCfg = Release|Any CPU
{AF5A20AE-292F-4649-A09B-3EF4BDB98951}.Release|x86.Build.0 = Release|Any CPU
{5CAA58C6-D65D-43B4-91CA-0B3A18B5C434}.Debug|Any CPU.ActiveCfg = Debug|x86
{5CAA58C6-D65D-43B4-91CA-0B3A18B5C434}.Debug|x64.ActiveCfg = Debug|x86
{5CAA58C6-D65D-43B4-91CA-0B3A18B5C434}.Debug|x86.ActiveCfg = Debug|x86
{5CAA58C6-D65D-43B4-91CA-0B3A18B5C434}.Debug|x86.Build.0 = Debug|x86
{5CAA58C6-D65D-43B4-91CA-0B3A18B5C434}.Release|Any CPU.ActiveCfg = Release|x86
{5CAA58C6-D65D-43B4-91CA-0B3A18B5C434}.Release|x64.ActiveCfg = Release|x86
{5CAA58C6-D65D-43B4-91CA-0B3A18B5C434}.Release|x86.ActiveCfg = Release|x86
{5CAA58C6-D65D-43B4-91CA-0B3A18B5C434}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Loading

0 comments on commit d1790e3

Please sign in to comment.