Skip to content

Commit 5b54e83

Browse files
committed
Move some files
1 parent ff1a36e commit 5b54e83

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed

.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
# Autogenerated VS/MD/Consulo solution and project files
3030
ExportedObj/
3131
.consulo/
32-
*.csproj
3332
*.unityproj
34-
*.sln
3533
*.suo
3634
*.tmp
3735
*.user
@@ -44,13 +42,8 @@ ExportedObj/
4442
*.opendb
4543
*.VC.db
4644

47-
!src/CefBrowserProcess/*.sln
48-
!src/CefBrowserProcess/*.csproj
4945
src/CefBrowserProcess/bin/*
5046

51-
src/UnityWebBrowserClient/GPUCache/*
52-
src/UnityWebBrowserClient/cef.log
53-
5447
# Unity3D generated meta files
5548
*.pidb.meta
5649
*.pdb.meta

src/CefBrowserProcess/CefBrowserProcess.csproj

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="NativeDefines.props" />
3+
<Import Project="../NativeDefines.props" />
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
@@ -32,10 +32,20 @@
3232
<ProjectReference Include="..\ThirdParty\CefGlue\CefGlue\CefGlue.csproj" />
3333
<ProjectReference Include="..\ThirdParty\ClrZmq4\ZeroMQ.netcore.csproj" />
3434
<PackageReference Include="MessagePack" Version="2.2.85" />
35+
<PackageReference Include="MessagePack.MSBuild.Tasks" Version="2.3.58-alpha">
36+
<PrivateAssets>all</PrivateAssets>
37+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
38+
</PackageReference>
3539

3640
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
3741
</ItemGroup>
3842

43+
<PropertyGroup>
44+
<MessagePackGeneratedResolverNamespace>MessagePack</MessagePackGeneratedResolverNamespace>
45+
<MessagePackGeneratedResolverName>GeneratedResolver</MessagePackGeneratedResolverName>
46+
<MessagePackGeneratedUsesMapMode>false</MessagePackGeneratedUsesMapMode>
47+
</PropertyGroup>
48+
3949
<!-- We need to copy different files depending on the OS -->
4050
<ItemGroup Condition="'$(IsWindowsBuild)'=='true'">
4151
<ContentWithTargetPath Include="..\ThirdParty\Libs\zmq\libzmq.dll" Link="Libs/%(Filename)%(Extension)">
@@ -133,6 +143,6 @@
133143
<Compile Include="..\UnityWebBrowser\Runtime\EventData\*.cs" LinkBase="EventData/" />
134144
</ItemGroup>
135145

136-
<Import Project="NatvieDefines.targets" />
146+
<Import Project="../NatvieDefines.targets" />
137147

138148
</Project>
File renamed without changes.
File renamed without changes.

src/CefBrowserProcess/CefBrowserProcess.sln renamed to src/UnityWebBrowser.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.31005.135
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefBrowserProcess", "CefBrowserProcess.csproj", "{6CBD8A48-C470-4C2E-8CE6-A48A75C64A46}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefBrowserProcess", "CefBrowserProcess\CefBrowserProcess.csproj", "{6CBD8A48-C470-4C2E-8CE6-A48A75C64A46}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZeroMQ.netcore", "..\ThirdParty\ClrZmq4\ZeroMQ.netcore.csproj", "{F7C69D32-89FD-492E-A6F7-9BC2C908A9B7}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZeroMQ.netcore", "ThirdParty\ClrZmq4\ZeroMQ.netcore.csproj", "{F7C69D32-89FD-492E-A6F7-9BC2C908A9B7}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefGlue", "..\ThirdParty\CefGlue\CefGlue\CefGlue.csproj", "{703FF300-34B9-48D4-A5D6-E741F48D5F95}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefGlue", "ThirdParty\CefGlue\CefGlue\CefGlue.csproj", "{703FF300-34B9-48D4-A5D6-E741F48D5F95}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution

0 commit comments

Comments
 (0)