From 4ee565635846232a1ccd6f262d1f5bd98c302b85 Mon Sep 17 00:00:00 2001 From: Brandon Watson Date: Fri, 5 Mar 2021 23:51:24 -0500 Subject: [PATCH] Moving protos to neutral place to be shared by projects --- .../AuroraCradle/aurora-cradle-sharp.csproj | 2 +- .../Proto/general.proto | 0 .../Aurora => aurora-proto}/Proto/party.proto | 2 +- .../Proto}/signal.proto | 0 aurora-sharp-desktop/Aurora/Aurora.csproj | 4 ++-- aurora.code-workspace | 23 ++++++++++++------- 6 files changed, 19 insertions(+), 12 deletions(-) rename {aurora-sharp-desktop/Aurora => aurora-proto}/Proto/general.proto (100%) rename {aurora-sharp-desktop/Aurora => aurora-proto}/Proto/party.proto (99%) rename {aurora-cradle-sharp/AuroraCradle/Src/Protos => aurora-proto/Proto}/signal.proto (100%) diff --git a/aurora-cradle-sharp/AuroraCradle/aurora-cradle-sharp.csproj b/aurora-cradle-sharp/AuroraCradle/aurora-cradle-sharp.csproj index 1e350d2..079857f 100644 --- a/aurora-cradle-sharp/AuroraCradle/aurora-cradle-sharp.csproj +++ b/aurora-cradle-sharp/AuroraCradle/aurora-cradle-sharp.csproj @@ -5,7 +5,7 @@ - + diff --git a/aurora-sharp-desktop/Aurora/Proto/general.proto b/aurora-proto/Proto/general.proto similarity index 100% rename from aurora-sharp-desktop/Aurora/Proto/general.proto rename to aurora-proto/Proto/general.proto diff --git a/aurora-sharp-desktop/Aurora/Proto/party.proto b/aurora-proto/Proto/party.proto similarity index 99% rename from aurora-sharp-desktop/Aurora/Proto/party.proto rename to aurora-proto/Proto/party.proto index d520b3a..d26950a 100644 --- a/aurora-sharp-desktop/Aurora/Proto/party.proto +++ b/aurora-proto/Proto/party.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package Aurora.Proto.Party; -import "Proto/general.proto"; +import "general.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/field_mask.proto"; diff --git a/aurora-cradle-sharp/AuroraCradle/Src/Protos/signal.proto b/aurora-proto/Proto/signal.proto similarity index 100% rename from aurora-cradle-sharp/AuroraCradle/Src/Protos/signal.proto rename to aurora-proto/Proto/signal.proto diff --git a/aurora-sharp-desktop/Aurora/Aurora.csproj b/aurora-sharp-desktop/Aurora/Aurora.csproj index 06593eb..1e65791 100644 --- a/aurora-sharp-desktop/Aurora/Aurora.csproj +++ b/aurora-sharp-desktop/Aurora/Aurora.csproj @@ -60,8 +60,8 @@ - - + + diff --git a/aurora.code-workspace b/aurora.code-workspace index 8457366..8d07a0e 100644 --- a/aurora.code-workspace +++ b/aurora.code-workspace @@ -1,11 +1,18 @@ { "folders": [ - { - "path": "aurora-sharp-desktop" - }, - { - "path": "aurora-cradle-sharp" - } -], - "settings": {} + { + "path": "aurora-sharp-desktop" + }, + { + "path": "aurora-cradle-sharp" + }, + { + "path": "aurora-proto" + } + ], +"settings": { + "files.exclude": { + "**/obj": true + } +} }