Skip to content

Commit

Permalink
Upgrade to VS2019
Browse files Browse the repository at this point in the history
  • Loading branch information
0xbadfca11 committed Nov 18, 2019
1 parent f466b46 commit 9e8bd70
Show file tree
Hide file tree
Showing 9 changed files with 204 additions and 79 deletions.
51 changes: 37 additions & 14 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,42 @@
image: Visual Studio 2017
matrix:
fast_finish: true
clone_depth: 1
environment:
PATH: 'C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%'
matrix:
- Platform: x64
CXXFLAGS: --target=x86_64-windows
- Platform: x64_x86
CXXFLAGS: --target=i386-windows
- Platform: x64_arm64
CXXFLAGS: --target=arm64-windows
matrix:
allow_failures:
- Platform: x64_arm64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
PlatformToolset: v142
WindowsTargetPlatformVersion: 10.0.17763.0
queryextents: queryextentsandrefcounts
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
PlatformToolset: v141
WindowsTargetPlatformVersion: 10.0.14393.0
queryextents: queryextents
platform:
- x64
- x86
- ARM64
configuration:
- Debug
- Release
for:
-
matrix:
only:
- platform: ARM64
test: off
build_script:
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %Platform%
- make -B
test: off
- cmd: msbuild /nologo %Project% /verbosity:minimal /p:Platform=%Platform% /p:Configuration=%Configuration% /p:PlatformToolset=%PlatformToolset% /p:WindowsTargetPlatformVersion=%WindowsTargetPlatformVersion%
before_test:
- ps: 'Initialize-Disk -Number (New-VHD -Path C:\test.vhdx -SizeBytes 127GB | Mount-VHD -Passthru).DiskNumber -PartitionStyle MBR -PassThru | New-Partition -UseMaximumSize -DriveLetter D | Format-Volume -FileSystem ReFS -Confirm:$false -Force'
test_script:
- cmd: |
fsutil file createnew D:\test1 10737418240
fsutil file setvaliddata D:\test1 10737418240
fsutil file %queryextents% D:\test1
if "%Platform%"=="x86" (%Configuration%\reflink.exe D:\test1 D:\test2) else (%Platform%\%Configuration%\reflink.exe D:\test1 D:\test2)
fsutil file %queryextents% D:\test1
fsutil file %queryextents% D:\test2
dd if=C:\Windows\System32\ntdll.dll of=D:\test2 bs=1M oflag=seek_bytes seek=1G conv=notrunc,fsync
fsutil file %queryextents% D:\test1
fsutil file %queryextents% D:\test2
deploy: off
138 changes: 121 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,32 +1,41 @@

# Created by https://www.gitignore.io/api/windows,visualstudio
# Edit at https://www.gitignore.io/?templates=windows,visualstudio

### Windows ###
# Windows image file caches
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
Desktop.ini
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk


### VisualStudio ###
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

# User-specific files
*.rsuser
*.suo
*.user
*.userosscache
Expand All @@ -35,48 +44,67 @@ $RECYCLE.BIN/
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Mono auto generated files
mono_crash.*

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

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

# Visual Studio 2017 auto generated files
Generated\ Files/

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

# NUNIT
# NUnit
*.VisualState.xml
TestResult.xml
nunit-*.xml

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

# DNX
# Benchmark Results
BenchmarkDotNet.Artifacts/

# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/

# StyleCop
StyleCopReport.xml

# Files built by Visual Studio
*_i.c
*_p.c
*_i.h
*_h.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
Expand All @@ -86,6 +114,7 @@ artifacts/
*.tlh
*.tmp
*.tmp_proj
*_wpftmp.csproj
*.log
*.vspscc
*.vssscc
Expand Down Expand Up @@ -114,6 +143,9 @@ ipch/
*.vspx
*.sap

# Visual Studio Trace Files
*.e2e

# TFS 2012 Local Workspace
$tf/

Expand All @@ -134,6 +166,14 @@ _TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover

# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json

# Visual Studio code coverage results
*.coverage
*.coveragexml

# NCrunch
_NCrunch_*
.*crunch*.local.xml
Expand Down Expand Up @@ -165,7 +205,7 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# Note: 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
Expand All @@ -177,13 +217,15 @@ PublishScripts/

# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
!**/[Pp]ackages/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
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets

Expand All @@ -200,24 +242,31 @@ AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
*.appxbundle
*.appxupload

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

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

# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
Expand All @@ -232,15 +281,22 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak

# SQL Server files
*.mdf
*.ldf
*.ndf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
*- [Bb]ackup.rdl
*- [Bb]ackup ([0-9]).rdl
*- [Bb]ackup ([0-9][0-9]).rdl

# Microsoft Fakes
FakesAssemblies/
Expand All @@ -250,13 +306,17 @@ FakesAssemblies/

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

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
Expand All @@ -272,7 +332,51 @@ paket-files/
# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml
# CodeRush personal settings
.cr/personal

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config

# Tabs Studio
*.tss

# Telerik's JustMock configuration file
*.jmconfig

# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs

# OpenCover UI analysis results
OpenCover/

# Azure Stream Analytics local run output
ASALocalRun/

# MSBuild Binary and Structured Log
*.binlog

# NVidia Nsight GPU debugger configuration file
*.nvuser

# MFractors (Xamarin productivity tool) working folder
.mfractor/

# Local History for Visual Studio
.localhistory/

# BeatPulse healthcheck temp database
healthchecksdb

# Backup folder for Package Reference Convert tool in Visual Studio 2017
MigrationBackup/

# End of https://www.gitignore.io/api/windows,visualstudio
4 changes: 2 additions & 2 deletions longPathAware.manifest
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<assembly>
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<assembly xmlns="urn:schemas-microsoft-com:asm.v3">
<application>
<windowsSettings>
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
</windowsSettings>
Expand Down
2 changes: 2 additions & 0 deletions main.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#define WIN32_LEAN_AND_MEAN
#define STRICT_GS_ENABLED
#define _ATL_NO_AUTOMATIC_NAMESPACE
#define _ATL_NO_DEFAULT_LIBS
#define _ATL_NO_WIN_SUPPORT
#define _CRTDBG_MAP_ALLOC
#include <atlbase.h>
#include <windows.h>
Expand Down
Loading

0 comments on commit 9e8bd70

Please sign in to comment.