Updated the server project to use the new Library Manager for clietn side libraries. Added the actual files that bower would get to source control. Updated the readme with fixing a failed UWP deployment due to issue with splashscreen.png.

This commit is contained in:
Hannes Nel 2018-08-30 13:46:28 +12:00
Родитель 2867968325
Коммит a90d27cfa3
18 изменённых файлов: 19605 добавлений и 36 удалений

Просмотреть файл

@ -1,4 +1,4 @@
SignalR Sample for Windows Mixed Reality
ASP.Net Core SignalR Sample for Unity 3d
========================================
Using SignalR over the native uNet integration makes for a more seamless
@ -109,3 +109,8 @@ need to use an earlier version of Unity, you will need to use the .Net Framework
version of ASP.Net SignalR, for which there are .Net 4.6 compatible libraries.
The process of importing and using the dlls are the same as demonstrated in
this sample. Additionally, you can use the .Net backend for UWP apps.
Error deploying UWP player in Visual Studio - Splashscreen
----------------------------------------------------------
You may encounter an error deploying a UWP player from Visual Studio, stating that there is an issue with finding splashscreen.png. To fix this, open the assets folder in the player output directory. Delete all the splashscreen.scale-xxx.png files except the splashscreen.scale-200.png file. Rename this file to splashscreen.png. Now remove the deleted files from your solution in Visual Studio and add the splashscreen.png file. Deployment should now work fine.

Просмотреть файл

@ -65,16 +65,16 @@
<Compile Include="Assets\Unity3DDebugLogProvider.cs" />
<None Include="Assets\link.xml" />
<Reference Include="UnityEditor.StandardEvents">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Library/ScriptAssemblies/UnityEditor.StandardEvents.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Library/ScriptAssemblies/UnityEditor.StandardEvents.dll</HintPath>
</Reference>
<Reference Include="Unity.TextMeshPro.Editor">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.PackageManagerUI.Editor">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.TextMeshPro">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.AIModule">
<HintPath>C:/Program Files/Unity/Hub/Editor/2018.2.3f1/Editor/Data/PlaybackEngines/MetroSupport/Tools/UnityEngine.AIModule.dll</HintPath>
@ -269,79 +269,79 @@
<HintPath>C:/Program Files/Unity/Hub/Editor/2018.2.3f1/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.Connections.Abstractions">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.Connections.Abstractions.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.Connections.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.Http.Connections.Client">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.Http.Connections.Client.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.Http.Connections.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.Http.Connections.Common">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.Http.Connections.Common.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.Http.Connections.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.Http.Features">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.Http.Features.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.Http.Features.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.SignalR.Client.Core">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.SignalR.Client.Core.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.SignalR.Client.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.SignalR.Client">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.SignalR.Client.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.SignalR.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.SignalR.Common">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.SignalR.Common.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.SignalR.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.SignalR.Protocols.Json">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.SignalR.Protocols.Json.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.AspNetCore.SignalR.Protocols.Json.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Configuration.Abstractions">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Configuration.Binder">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Configuration.Binder.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Configuration.Binder.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Configuration">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Configuration.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Configuration.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.DependencyInjection.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Logging.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Logging.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Options">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Options.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Options.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Primitives">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Primitives.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Microsoft.Extensions.Primitives.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Newtonsoft.Json.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Buffers">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Buffers.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.IO.Pipelines">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.IO.Pipelines.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Memory">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Memory.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics.Vectors">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Numerics.Vectors.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Threading.Channels.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Threading.Channels.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions">
<HintPath>C:/Dev/SignalR/samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Threading.Tasks.Extensions.dll</HintPath>
<HintPath>C:/Dev/SignalR-samples/Unity3d/SimpleChatClient/UnityProject/Assets/Plugins/SignalR/System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>C:/Users/hannesne/AppData/Local/Unity/cache/packages/packages.unity.com/com.unity.analytics@2.0.16/UnityEngine.Analytics.dll</HintPath>

Просмотреть файл

@ -6,12 +6,12 @@
<title>@ViewData["Title"] - SimpleChatServer</title>
<environment include="Development">
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
<link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.css" />
<link rel="stylesheet" href="~/css/site.css" />
</environment>
<environment exclude="Development">
<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
asp-fallback-href="~/lib/bootstrap/css/bootstrap.min.css"
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
</environment>
@ -49,19 +49,19 @@
</div>
<environment include="Development">
<script src="~/lib/jquery/dist/jquery.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
<script src="~/lib/jquery/jquery.js"></script>
<script src="~/lib/bootstrap/js/bootstrap.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
</environment>
<environment exclude="Development">
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-3.3.1.min.js"
asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
asp-fallback-src="~/lib/jquery/jquery.min.js"
asp-fallback-test="window.jQuery"
crossorigin="anonymous"
integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT">
</script>
<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
asp-fallback-src="~/lib/bootstrap/js/bootstrap.min.js"
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
crossorigin="anonymous"
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">

Просмотреть файл

@ -4,6 +4,14 @@
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Content Remove="bundleconfig.json" />
</ItemGroup>
<ItemGroup>
<_ContentIncludedByDefault Remove="bundleconfig.json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
@ -12,4 +20,8 @@
<Folder Include="wwwroot\lib\signalr\" />
</ItemGroup>
<ItemGroup>
<None Include="bundleconfig.json" />
</ItemGroup>
</Project>

Просмотреть файл

@ -0,0 +1,8 @@
[
{
"outputFileName": "wwwroot/css/site.min.css",
"inputFiles": [
"wwwroot/css/site.css"
]
}
]

Просмотреть файл

@ -0,0 +1,28 @@
{
"version": "1.0",
"defaultProvider": "cdnjs",
"libraries": [
{
"library": "twitter-bootstrap@3.3.7",
"files": [
"css/bootstrap.css",
"css/bootstrap.min.css",
"css/bootstrap.css.map",
"css/bootstrap.min.css.map",
"js/bootstrap.js",
"js/bootstrap.min.js",
"fonts/glyphicons-halflings-regular.woff2",
"fonts/glyphicons-halflings-regular.woff",
"fonts/glyphicons-halflings-regular.ttf"
],
"destination": "wwwroot/lib/bootstrap/"
},
{
"library": "jquery@3.3.1",
"destination": "wwwroot/lib/jquery/",
"files": [
"jquery.js","jquery.min.js"
]
}
]
}

Просмотреть файл

@ -0,0 +1 @@
body{padding-top:50px;padding-bottom:20px}.body-content{padding-left:15px;padding-right:15px}.carousel-caption p{font-size:20px;line-height:1.4}.carousel-inner .item img[src$=".svg"]{width:100%}#qrCode{margin:15px}@media screen and (max-width:767px){.carousel-caption{display:none}}

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Двоичный файл не отображается.

Двоичный файл не отображается.

Двоичный файл не отображается.

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Различия файлов скрыты, потому что одна или несколько строк слишком длинны