Skip to content

Commit

Permalink
Merge pull request #6 from timcassell/core_and_unity
Browse files Browse the repository at this point in the history
DotNet Core sln and Unity project
  • Loading branch information
timcassell authored Oct 30, 2020
2 parents 2b8e92a + b9879ab commit 37a0f8b
Show file tree
Hide file tree
Showing 154 changed files with 3,082 additions and 1,025 deletions.
102 changes: 9 additions & 93 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ bld/
.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
Expand Down Expand Up @@ -72,10 +68,7 @@ artifacts/
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*


# Visual C++ cache files
ipch/
*.aps
Expand All @@ -92,63 +85,7 @@ ipch/
*.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
Expand Down Expand Up @@ -196,14 +133,7 @@ ClientBin/
*.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 ;-)
Expand All @@ -215,12 +145,7 @@ UpgradeLog*.htm
# SQL Server files
*.mdf
*.ldf

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


# Microsoft Fakes
FakesAssemblies/

Expand All @@ -235,15 +160,7 @@ FakesAssemblies/

# 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/
Expand All @@ -263,12 +180,11 @@ paket-files/

# Unity3D generated meta files
*.pidb.meta
# Script meta files
*.cs.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt
*.blend1
*.csproj
*.sln
[Ll]ibrary/
[Ll]ibraries/
Assets/Art/Prefabs/Combat UI/HP.prefab.meta
[Ll]ibraries/
11 changes: 0 additions & 11 deletions Cancelations/CancelationRegistration.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Cancelations/CancelationSource.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Cancelations/CancelationToken.cs.meta

This file was deleted.

15 changes: 15 additions & 0 deletions DeveloperNotes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
To create the UnityPackage for releases:

1. Delete existing `ProtoPromise_Unity/Assets/ThirdParty/ProtoPromise/Scripts` directory.
2. Copy the `Runtime/ProtoPromise` folder into `ProtoPromise_Unity/Assets/ThirdParty/ProtoPromise` and rename it to `Scripts`.
3. Copy `ReleaseNotes.md` and `LICENSE` into the `ProtoPromise` directory.
4. Edit `README.md` to remove the `## Getting Started` and `## Latest Updates` sections, then convert it to `README.pdf` (can use https://www.markdowntopdf.com/) and place it in the `ProtoPromise` directory (discard the changes to `README.md` before git commit).
5. In the Unity editor, right-click the `ProtoPromise` folder and click `Export Package...`, include everything, then click `Export...` and name the exported file `ProtoPromise.unitypackage`.
6. Upload `ProtoPromise.unitypackage` with the release on GitHub.
7. Upload and publish new Unity Asset Store version.
8. Repeat these steps for each new release.

Unity version may need to be updated to use the earliest version that the Asset Store Tools supports.


By default, ProtoPromise types are marked with the DebuggerNonUserCode attribute, making it impossible to step into the library code with Visual Studio's debugger. To disable this (or rather, to enable debugging), define the compiler symbol `PROTO_PROMISE_DEVELOPER_MODE`.
11 changes: 0 additions & 11 deletions InternalShared/CancelDelegateWrappersInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions InternalShared/ExceptionsInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions InternalShared/HelperFunctionsInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions InternalShared/HelperTypesInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions InternalShared/InterfacesInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions InternalShared/ValueContainersInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Config.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Deferred.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Exceptions.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Extensions.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Internal/AllInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Internal/AsyncAwaitInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Internal/CancelInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Internal/DebugInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Internal/DelegateWrappersInternal.cs.meta

This file was deleted.

11 changes: 0 additions & 11 deletions Promises/Internal/FirstInternal.cs.meta

This file was deleted.

Loading

0 comments on commit 37a0f8b

Please sign in to comment.