alysbrooks-public » games » isometric-park-fna

Commit r188:8c0aa0480905 public

parent | child
Description:
Merge in default branch.
Commit status:
[Not Reviewed]
References:
merge m3-contracts
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r188:8c0aa0480905 -

Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 ccf73b859df7dddc357676bd95436a0b13bdd512
1 8ee6b95dcd628b76a0d5ee914132625645a90707
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -22,10 +22,10
22 22
23 23
24 24 run-core-debug:
25 cd isometric-park-fna/bin/Debug/netcoreapp3.1; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="/Users/alys/repos/isometric-park-fna/fnalibs/osx" dotnet ./isometric-park-fna.dll
25 cd isometric-park-fna/bin/Debug/netcoreapp3.1; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="../../../../fnalibs/osx" dotnet ./isometric-park-fna.dll
26 26
27 27 run-core-release:
28 cd isometric-park-fna/bin/Release/netcoreapp3.1; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="/Users/alys/repos/isometric-park-fna/fnalibs/osx" dotnet ./isometric-park-fna.dll
28 cd isometric-park-fna/bin/Release/netcoreapp3.1; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="../../../../fnalibs/osx" dotnet ./isometric-park-fna.dll
29 29
30 30 # lint:
31 31 # yamllint -d relaxed isometric-park-fna/Content/news_items.yaml
@@ -36,7 +36,7
36 36 release: framework-release
37 37
38 38 run: framework-debug
39 cd isometric-park-fna/bin/Debug/; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="/Users/alys/repos/isometric-park-fna/fnalibs/osx" mono isometric-park-fna.exe
39 cd isometric-park-fna/bin/Debug/; LD_LIBRARY_PATH="../../../fnalibs/lib64" DYLD_LIBRARY_PATH="../../../fnalibs/osx" mono isometric-park-fna.exe
40 40
41 41
42 42
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 eb53a31a465d1700585a27323fb9618e935e3337
1 0d126f771b88f01f6a28944a5ac1d8a59fabfd62
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,14 +1,14
1 1 {
2 2 "format": 1,
3 3 "restore": {
4 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
4 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
5 5 },
6 6 "projects": {
7 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
7 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
8 8 "restore": {
9 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
9 "projectUniqueName": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
10 10 "projectName": "FNA",
11 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
11 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
12 12 "frameworks": {
13 13 "net48": {
14 14 "projectReferences": {}
@@ -19,17 +19,20
19 19 "net48": {}
20 20 }
21 21 },
22 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
22 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
23 23 "version": "1.0.0",
24 24 "restore": {
25 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
25 "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
26 26 "projectName": "SpriteFontPlus",
27 "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
28 "packagesPath": "/Users/alys/.nuget/packages/",
29 "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
27 "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
28 "packagesPath": "/home/alys/.nuget/packages/",
29 "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
30 30 "projectStyle": "PackageReference",
31 "fallbackFolders": [
32 "/usr/share/dotnet/sdk/NuGetFallbackFolder"
33 ],
31 34 "configFilePaths": [
32 "/Users/alys/.config/NuGet/NuGet.Config"
35 "/home/alys/.config/NuGet/NuGet.Config"
33 36 ],
34 37 "originalTargetFrameworks": [
35 38 "net45"
@@ -40,8 +43,8
40 43 "frameworks": {
41 44 "net45": {
42 45 "projectReferences": {
43 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
44 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
46 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
47 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj"
45 48 }
46 49 }
47 50 }
@@ -53,9 +56,7
53 56 }
54 57 },
55 58 "frameworks": {
56 "net45": {
57 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
58 }
59 "net45": {}
59 60 }
60 61 }
61 62 }
Show file before | Show file after | Show commentsHide comments
@@ -4,8 +4,8
4 4 <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
5 5 <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6 6 <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/alys/.nuget/packages/</NuGetPackageRoot>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/alys/.nuget/packages/;/usr/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
9 9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10 10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
11 11 </PropertyGroup>
Show file before | Show file after | Show commentsHide comments
@@ -26,7 +26,8
26 26 ]
27 27 },
28 28 "packageFolders": {
29 "/Users/alys/.nuget/packages/": {}
29 "/home/alys/.nuget/packages/": {},
30 "/usr/share/dotnet/sdk/NuGetFallbackFolder": {}
30 31 },
31 32 "project": {
32 33 "version": "1.0.0",
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: file was removed, binary diff hidden
You need to be logged in to leave comments. Login now