Skip to content

Commit 2174202

Browse files
authored
.NET7 (#3)
* .NET6 * net7.0 * Cleanup * Add workflow * Detect 32/64 bit runtime * Change client AutoRun order to DX -> GL -> XNA * Support UniversalGL through command line * Update dotnet detection * Don't require Desktop Runtime for UniversalGL * Detect Microsoft.NETCore.App & Microsoft.WindowsDesktop.App * Merge forms * Cleanup * Address review comments
1 parent 794550a commit 2174202

25 files changed

+1157
-1292
lines changed

.editorconfig

Lines changed: 466 additions & 0 deletions
Large diffs are not rendered by default.

.gitattributes

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

.github/workflows/publish.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Publish
2+
on:
3+
workflow_dispatch:
4+
permissions:
5+
contents: write
6+
jobs:
7+
publish:
8+
runs-on: windows-latest
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@main
12+
with:
13+
fetch-depth: 0
14+
15+
- name: Setup .NET Core SDK
16+
uses: actions/setup-dotnet@main
17+
with:
18+
dotnet-version: '7.x.x'
19+
20+
- name: Install GitVersion
21+
uses: gittools/actions/gitversion/setup@main
22+
with:
23+
versionSpec: '5.x'
24+
25+
- name: Determine Version
26+
uses: gittools/actions/gitversion/execute@main
27+
28+
- name: Publish
29+
run: dotnet publish DTALauncherStub.csproj --configuration Release --no-self-contained -p:PublishSingleFile=true -r win-x86 -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
30+
31+
- name: Zip
32+
run: 7z a -r ${{ format('DTALauncherStub-v{0}-net7.0-windows-x86.zip', env.GitVersion_SemVer) }} ./bin/Release/net7.0-windows/win-x86/publish/*.*
33+
34+
- name: Prerelease
35+
if: ${{ env.GitVersion_PreReleaseTag != '' }}
36+
run: gh release create ${{ format('v{0}', env.GitVersion_SemVer) }} (get-item *.zip) --generate-notes --target ${{ github.sha }} --prerelease
37+
env:
38+
GH_TOKEN: ${{ github.token }}
39+
40+
- name: Release
41+
if: ${{ env.GitVersion_PreReleaseTag == '' }}
42+
run: gh release create ${{ format('v{0}', env.GitVersion_SemVer) }} (get-item *.zip) --generate-notes --target ${{ github.sha }}
43+
env:
44+
GH_TOKEN: ${{ github.token }}

.gitignore

Lines changed: 88 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33
##
4-
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
4+
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
55

66
# User-specific files
7+
*.rsuser
78
*.suo
89
*.user
910
*.userosscache
@@ -12,17 +13,24 @@
1213
# User-specific files (MonoDevelop/Xamarin Studio)
1314
*.userprefs
1415

16+
# Mono auto generated files
17+
mono_crash.*
18+
1519
# Build results
1620
[Dd]ebug/
1721
[Dd]ebugPublic/
1822
[Rr]elease/
1923
[Rr]eleases/
2024
x64/
2125
x86/
26+
[Ww][Ii][Nn]32/
27+
[Aa][Rr][Mm]/
28+
[Aa][Rr][Mm]64/
2229
bld/
2330
[Bb]in/
2431
[Oo]bj/
2532
[Ll]og/
33+
[Ll]ogs/
2634

2735
# Visual Studio 2015/2017 cache/options directory
2836
.vs/
@@ -36,9 +44,10 @@ Generated\ Files/
3644
[Tt]est[Rr]esult*/
3745
[Bb]uild[Ll]og.*
3846

39-
# NUNIT
47+
# NUnit
4048
*.VisualState.xml
4149
TestResult.xml
50+
nunit-*.xml
4251

4352
# Build Results of an ATL Project
4453
[Dd]ebugPS/
@@ -52,15 +61,17 @@ BenchmarkDotNet.Artifacts/
5261
project.lock.json
5362
project.fragment.lock.json
5463
artifacts/
55-
**/Properties/launchSettings.json
64+
65+
# ASP.NET Scaffolding
66+
ScaffoldingReadMe.txt
5667

5768
# StyleCop
5869
StyleCopReport.xml
5970

6071
# Files built by Visual Studio
6172
*_i.c
6273
*_p.c
63-
*_i.h
74+
*_h.h
6475
*.ilk
6576
*.meta
6677
*.obj
@@ -77,7 +88,9 @@ StyleCopReport.xml
7788
*.tlh
7889
*.tmp
7990
*.tmp_proj
91+
*_wpftmp.csproj
8092
*.log
93+
*.tlog
8194
*.vspscc
8295
*.vssscc
8396
.builds
@@ -119,9 +132,6 @@ _ReSharper*/
119132
*.[Rr]e[Ss]harper
120133
*.DotSettings.user
121134

122-
# JustCode is a .NET coding add-in
123-
.JustCode
124-
125135
# TeamCity is a build add-in
126136
_TeamCity*
127137

@@ -132,6 +142,11 @@ _TeamCity*
132142
.axoCover/*
133143
!.axoCover/settings.json
134144

145+
# Coverlet is a free, cross platform Code Coverage Tool
146+
coverage*.json
147+
coverage*.xml
148+
coverage*.info
149+
135150
# Visual Studio code coverage results
136151
*.coverage
137152
*.coveragexml
@@ -179,6 +194,8 @@ PublishScripts/
179194

180195
# NuGet Packages
181196
*.nupkg
197+
# NuGet Symbol Packages
198+
*.snupkg
182199
# The packages folder can be ignored because of Package Restore
183200
**/[Pp]ackages/*
184201
# except build/, which is used as an MSBuild target.
@@ -203,12 +220,14 @@ BundleArtifacts/
203220
Package.StoreAssociation.xml
204221
_pkginfo.txt
205222
*.appx
223+
*.appxbundle
224+
*.appxupload
206225

207226
# Visual Studio cache files
208227
# files ending in .cache can be ignored
209228
*.[Cc]ache
210229
# but keep track of directories ending in .cache
211-
!*.[Cc]ache/
230+
!?*.[Cc]ache/
212231

213232
# Others
214233
ClientBin/
@@ -221,7 +240,7 @@ ClientBin/
221240
*.publishsettings
222241
orleans.codegen.cs
223242

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

@@ -252,6 +271,9 @@ ServiceFabricBackup/
252271
*.bim.layout
253272
*.bim_*.settings
254273
*.rptproj.rsuser
274+
*- [Bb]ackup.rdl
275+
*- [Bb]ackup ([0-9]).rdl
276+
*- [Bb]ackup ([0-9][0-9]).rdl
255277

256278
# Microsoft Fakes
257279
FakesAssemblies/
@@ -272,6 +294,17 @@ node_modules/
272294
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
273295
*.vbw
274296

297+
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
298+
*.vbp
299+
300+
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
301+
*.dsw
302+
*.dsp
303+
304+
# Visual Studio 6 technical files
305+
*.ncb
306+
*.aps
307+
275308
# Visual Studio LightSwitch build output
276309
**/*.HTMLClient/GeneratedArtifacts
277310
**/*.DesktopClient/GeneratedArtifacts
@@ -287,12 +320,8 @@ paket-files/
287320
# FAKE - F# Make
288321
.fake/
289322

290-
# JetBrains Rider
291-
.idea/
292-
*.sln.iml
293-
294-
# CodeRush
295-
.cr/
323+
# CodeRush personal settings
324+
.cr/personal
296325

297326
# Python Tools for Visual Studio (PTVS)
298327
__pycache__/
@@ -317,7 +346,7 @@ __pycache__/
317346
# OpenCover UI analysis results
318347
OpenCover/
319348

320-
# Azure Stream Analytics local run output
349+
# Azure Stream Analytics local run output
321350
ASALocalRun/
322351

323352
# MSBuild Binary and Structured Log
@@ -326,5 +355,47 @@ ASALocalRun/
326355
# NVidia Nsight GPU debugger configuration file
327356
*.nvuser
328357

329-
# MFractors (Xamarin productivity tool) working folder
358+
# MFractors (Xamarin productivity tool) working folder
330359
.mfractor/
360+
361+
# Local History for Visual Studio
362+
.localhistory/
363+
364+
# Visual Studio History (VSHistory) files
365+
.vshistory/
366+
367+
# BeatPulse healthcheck temp database
368+
healthchecksdb
369+
370+
# Backup folder for Package Reference Convert tool in Visual Studio 2017
371+
MigrationBackup/
372+
373+
# Ionide (cross platform F# VS Code tools) working folder
374+
.ionide/
375+
376+
# Fody - auto-generated XML schema
377+
FodyWeavers.xsd
378+
379+
# VS Code files for those working on multiple tools
380+
.vscode/*
381+
!.vscode/settings.json
382+
!.vscode/tasks.json
383+
!.vscode/launch.json
384+
!.vscode/extensions.json
385+
*.code-workspace
386+
387+
# Local History for Visual Studio Code
388+
.history/
389+
390+
# Windows Installer files from build outputs
391+
*.cab
392+
*.msi
393+
*.msix
394+
*.msm
395+
*.msp
396+
397+
# JetBrains Rider
398+
*.sln.iml
399+
400+
# CnCNet
401+
/Compiled

App.config

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)