Skip to content

Commit bc40d03

Browse files
jsmittyjsmitty
authored
Merge pull request #1 from jsmitty/develop
Updated to VS 2017
2 parents b6ef8d8 + d616257 commit bc40d03

File tree

3 files changed

+263
-16
lines changed

3 files changed

+263
-16
lines changed

‎.gitignore

+257-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,263 @@
1-
*.cache
1+
## Ignore Visual Studio temporary files, build results, and
2+
## files generated by popular Visual Studio add-ons.
3+
4+
# User-specific files
25
*.suo
3-
*.sdf
4-
*.opensdf
56
*.user
6-
*.VisualState.xml
7-
[Bb]in/
8-
[Oo]bj/
7+
*.userosscache
8+
*.sln.docstates
9+
10+
# User-specific files (MonoDevelop/Xamarin Studio)
11+
*.userprefs
12+
13+
# Build results
914
[Dd]ebug/
15+
[Dd]ebugPublic/
1016
[Rr]elease/
11-
[Ll]ib/
17+
[Rr]eleases/
1218
[Ii]nclude/
19+
[Ll]ib/
20+
x64/
21+
x86/
22+
bld/
23+
[Bb]in/
24+
[Oo]bj/
25+
[Ll]og/
26+
27+
# Visual Studio 2015 cache/options directory
28+
.vs/
29+
# Uncomment if you have tasks that create the project's static files in wwwroot
30+
#wwwroot/
31+
32+
# MSTest test Results
33+
[Tt]est[Rr]esult*/
34+
[Bb]uild[Ll]og.*
35+
36+
# NUNIT
37+
*.VisualState.xml
38+
TestResult.xml
39+
40+
# Build Results of an ATL Project
41+
[Dd]ebugPS/
42+
[Rr]eleasePS/
43+
dlldata.c
44+
45+
# DNX
46+
project.lock.json
47+
project.fragment.lock.json
48+
artifacts/
49+
50+
*_i.c
51+
*_p.c
52+
*_i.h
53+
*.ilk
54+
*.meta
55+
*.obj
56+
*.pch
57+
*.pdb
58+
*.pgc
59+
*.pgd
60+
*.rsp
61+
*.sbr
62+
*.tlb
63+
*.tli
64+
*.tlh
65+
*.tmp
66+
*.tmp_proj
67+
*.log
68+
*.vspscc
69+
*.vssscc
70+
.builds
71+
*.pidb
72+
*.svclog
73+
*.scc
74+
75+
# Chutzpah Test files
76+
_Chutzpah*
77+
78+
# Visual C++ cache files
79+
ipch/
80+
*.aps
81+
*.ncb
82+
*.opendb
83+
*.opensdf
84+
*.sdf
85+
*.cachefile
86+
*.VC.db
87+
*.VC.VC.opendb
88+
89+
# Visual Studio profiler
90+
*.psess
91+
*.vsp
92+
*.vspx
93+
*.sap
94+
95+
# TFS 2012 Local Workspace
96+
$tf/
97+
98+
# Guidance Automation Toolkit
99+
*.gpState
100+
101+
# ReSharper is a .NET coding add-in
102+
_ReSharper*/
103+
*.[Rr]e[Ss]harper
104+
*.DotSettings.user
105+
106+
# JustCode is a .NET coding add-in
107+
.JustCode
108+
109+
# TeamCity is a build add-in
110+
_TeamCity*
111+
112+
# DotCover is a Code Coverage Tool
113+
*.dotCover
114+
115+
# NCrunch
116+
_NCrunch_*
117+
.*crunch*.local.xml
118+
nCrunchTemp_*
119+
120+
# MightyMoose
121+
*.mm.*
122+
AutoTest.Net/
123+
124+
# Web workbench (sass)
125+
.sass-cache/
126+
127+
# Installshield output folder
128+
[Ee]xpress/
129+
130+
# DocProject is a documentation generator add-in
131+
DocProject/buildhelp/
132+
DocProject/Help/*.HxT
133+
DocProject/Help/*.HxC
134+
DocProject/Help/*.hhc
135+
DocProject/Help/*.hhk
136+
DocProject/Help/*.hhp
137+
DocProject/Help/Html2
138+
DocProject/Help/html
139+
140+
# Click-Once directory
141+
publish/
142+
143+
# Publish Web Output
144+
*.[Pp]ublish.xml
145+
*.azurePubxml
146+
# TODO: Comment the next line if you want to checkin your web deploy settings
147+
# but database connection strings (with potential passwords) will be unencrypted
148+
#*.pubxml
149+
*.publishproj
150+
151+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
152+
# checkin your Azure Web App publish settings, but sensitive information contained
153+
# in these scripts will be unencrypted
154+
PublishScripts/
155+
156+
# NuGet Packages
13157
*.nupkg
158+
# The packages folder can be ignored because of Package Restore
159+
**/packages/*
160+
# except build/, which is used as an MSBuild target.
161+
!**/packages/build/
162+
# Uncomment if necessary however generally it will be regenerated when needed
163+
#!**/packages/repositories.config
164+
# NuGet v3's project.json files produces more ignoreable files
165+
*.nuget.props
166+
*.nuget.targets
167+
168+
# Microsoft Azure Build Output
169+
csx/
170+
*.build.csdef
171+
172+
# Microsoft Azure Emulator
173+
ecf/
174+
rcf/
175+
176+
# Windows Store app package directories and files
177+
AppPackages/
178+
BundleArtifacts/
179+
Package.StoreAssociation.xml
180+
_pkginfo.txt
181+
182+
# Visual Studio cache files
183+
# files ending in .cache can be ignored
184+
*.[Cc]ache
185+
# but keep track of directories ending in .cache
186+
!*.[Cc]ache/
187+
188+
# Others
189+
ClientBin/
190+
~$*
191+
*~
192+
*.dbmdl
193+
*.dbproj.schemaview
194+
*.jfm
195+
*.pfx
196+
*.publishsettings
197+
node_modules/
198+
orleans.codegen.cs
199+
200+
# Since there are multiple workflows, uncomment next line to ignore bower_components
201+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
202+
#bower_components/
203+
204+
# RIA/Silverlight projects
205+
Generated_Code/
206+
207+
# Backup & report files from converting an old project file
208+
# to a newer Visual Studio version. Backup files are not needed,
209+
# because we have git ;-)
210+
_UpgradeReport_Files/
211+
Backup*/
212+
UpgradeLog*.XML
213+
UpgradeLog*.htm
214+
215+
# SQL Server files
216+
*.mdf
217+
*.ldf
218+
219+
# Business Intelligence projects
220+
*.rdl.data
221+
*.bim.layout
222+
*.bim_*.settings
223+
224+
# Microsoft Fakes
225+
FakesAssemblies/
226+
227+
# GhostDoc plugin setting file
228+
*.GhostDoc.xml
229+
230+
# Node.js Tools for Visual Studio
231+
.ntvs_analysis.dat
232+
233+
# Visual Studio 6 build log
234+
*.plg
235+
236+
# Visual Studio 6 workspace options file
237+
*.opt
238+
239+
# Visual Studio LightSwitch build output
240+
**/*.HTMLClient/GeneratedArtifacts
241+
**/*.DesktopClient/GeneratedArtifacts
242+
**/*.DesktopClient/ModelManifest.xml
243+
**/*.Server/GeneratedArtifacts
244+
**/*.Server/ModelManifest.xml
245+
_Pvt_Extensions
246+
247+
# Paket dependency manager
248+
.paket/paket.exe
249+
paket-files/
250+
251+
# FAKE - F# Make
252+
.fake/
253+
254+
# JetBrains Rider
255+
.idea/
256+
*.sln.iml
257+
258+
# CodeRush
259+
.cr/
260+
261+
# Python Tools for Visual Studio (PTVS)
262+
__pycache__/
263+
*.pyc

‎src/CSharpLibrary/ExampleObject.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,10 @@ private void checkAndFireEvent()
5757
{
5858
if (_trackedInt % 2 == 0)
5959
{
60-
if (EvenNumberAchieved != null)
61-
EvenNumberAchieved(this, new CustomArgs("Even Number!"));
60+
EvenNumberAchieved?.Invoke(this, new CustomArgs("Even Number!"));
6261
}
6362
else
64-
{
65-
if (OddNumberAchieved != null)
66-
OddNumberAchieved(this, new CustomArgs("Odd Number!"));
67-
}
63+
OddNumberAchieved?.Invoke(this, new CustomArgs("Odd Number!"));
6864
}
6965
}
7066
}

‎src/NativeCLibrary/NativeCLibrary.vcxproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -14,18 +14,19 @@
1414
<ProjectGuid>{CE1A4BC1-C7C6-47F8-829E-56CF49A24FB2}</ProjectGuid>
1515
<Keyword>Win32Proj</Keyword>
1616
<RootNamespace>NativeCLibrary</RootNamespace>
17+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
1718
</PropertyGroup>
1819
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
1920
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2021
<ConfigurationType>Application</ConfigurationType>
2122
<UseDebugLibraries>true</UseDebugLibraries>
22-
<PlatformToolset>v120</PlatformToolset>
23+
<PlatformToolset>v141</PlatformToolset>
2324
<CharacterSet>Unicode</CharacterSet>
2425
</PropertyGroup>
2526
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2627
<ConfigurationType>Application</ConfigurationType>
2728
<UseDebugLibraries>false</UseDebugLibraries>
28-
<PlatformToolset>v120</PlatformToolset>
29+
<PlatformToolset>v141</PlatformToolset>
2930
<WholeProgramOptimization>true</WholeProgramOptimization>
3031
<CharacterSet>Unicode</CharacterSet>
3132
</PropertyGroup>

0 commit comments

Comments
 (0)