diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 000000000..566e6f416
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,9 @@
+
+
+
+ 1.41.2
+ netcoreapp3.1
+ Bit.$(MSBuildProjectName)
+
+
+
\ No newline at end of file
diff --git a/bitwarden-server.sln b/bitwarden-server.sln
index fcd2afc65..8401f1855 100644
--- a/bitwarden-server.sln
+++ b/bitwarden-server.sln
@@ -22,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
NuGet.Config = NuGet.Config
README.md = README.md
SECURITY.md = SECURITY.md
+ Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\Core.csproj", "{3973D21B-A692-4B60-9B70-3631C057423A}"
diff --git a/src/Admin/Admin.csproj b/src/Admin/Admin.csproj
index fc03f0094..95686cc19 100644
--- a/src/Admin/Admin.csproj
+++ b/src/Admin/Admin.csproj
@@ -1,9 +1,6 @@
- 1.41.2
- netcoreapp3.1
- Bit.Admin
bitwarden-Admin
diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj
index 8b67d1798..41fc38fa2 100644
--- a/src/Api/Api.csproj
+++ b/src/Api/Api.csproj
@@ -1,9 +1,6 @@
- 1.41.2
- netcoreapp3.1
- Bit.Api
bitwarden-Api
false
bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
diff --git a/src/Billing/Billing.csproj b/src/Billing/Billing.csproj
index f55294183..58ffae213 100644
--- a/src/Billing/Billing.csproj
+++ b/src/Billing/Billing.csproj
@@ -1,9 +1,6 @@
- 1.41.2
- netcoreapp3.1
- Bit.Billing
bitwarden-Billing
false
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 8790584ba..5db7064b3 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -1,8 +1,6 @@
- netcoreapp3.1
- Bit.Core
false
bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
diff --git a/src/Events/Events.csproj b/src/Events/Events.csproj
index 50276ab6e..1b58c7f70 100644
--- a/src/Events/Events.csproj
+++ b/src/Events/Events.csproj
@@ -1,9 +1,6 @@
- 1.41.2
- netcoreapp3.1
- Bit.Events
bitwarden-Events
false
diff --git a/src/EventsProcessor/EventsProcessor.csproj b/src/EventsProcessor/EventsProcessor.csproj
index 8bed3cbe8..3e8876489 100644
--- a/src/EventsProcessor/EventsProcessor.csproj
+++ b/src/EventsProcessor/EventsProcessor.csproj
@@ -1,9 +1,6 @@
- 1.41.2
- netcoreapp3.1
- Bit.EventsProcessor
bitwarden-EventsProcessor
diff --git a/src/Icons/Icons.csproj b/src/Icons/Icons.csproj
index 392fe5732..31fa723a0 100644
--- a/src/Icons/Icons.csproj
+++ b/src/Icons/Icons.csproj
@@ -1,9 +1,6 @@
- 1.41.2
- netcoreapp3.1
- Bit.Icons
bitwarden-Icons
false
diff --git a/src/Identity/Identity.csproj b/src/Identity/Identity.csproj
index 92cfc3d95..7c3ea2901 100644
--- a/src/Identity/Identity.csproj
+++ b/src/Identity/Identity.csproj
@@ -1,9 +1,6 @@
- 1.41.2
- netcoreapp3.1
- Bit.Identity
bitwarden-Identity
false
diff --git a/src/Notifications/Notifications.csproj b/src/Notifications/Notifications.csproj
index 8a883d124..831f03e89 100644
--- a/src/Notifications/Notifications.csproj
+++ b/src/Notifications/Notifications.csproj
@@ -1,9 +1,6 @@
- 1.41.2
- netcoreapp3.1
- Bit.Notifications
bitwarden-Notifications
diff --git a/test/Api.Test/Api.Test.csproj b/test/Api.Test/Api.Test.csproj
index df630cf23..16a0851b8 100644
--- a/test/Api.Test/Api.Test.csproj
+++ b/test/Api.Test/Api.Test.csproj
@@ -1,8 +1,6 @@
- netcoreapp3.1
-
false
diff --git a/test/Core.Test/Core.Test.csproj b/test/Core.Test/Core.Test.csproj
index f91a607cd..09fda2ffe 100644
--- a/test/Core.Test/Core.Test.csproj
+++ b/test/Core.Test/Core.Test.csproj
@@ -1,7 +1,6 @@
- netcoreapp3.1
false
Bit.Core.Test
diff --git a/util/Migrator/Migrator.csproj b/util/Migrator/Migrator.csproj
index 34653b347..2c994fe5f 100644
--- a/util/Migrator/Migrator.csproj
+++ b/util/Migrator/Migrator.csproj
@@ -1,10 +1,5 @@
-
- netcoreapp3.1
- Bit.Migrator
-
-
diff --git a/util/Server/Server.csproj b/util/Server/Server.csproj
index 9c415cba4..7179fdc16 100644
--- a/util/Server/Server.csproj
+++ b/util/Server/Server.csproj
@@ -1,9 +1,7 @@
- netcoreapp3.1
false
- Bit.Server
diff --git a/util/Setup/Setup.csproj b/util/Setup/Setup.csproj
index f095c43c6..daa675446 100644
--- a/util/Setup/Setup.csproj
+++ b/util/Setup/Setup.csproj
@@ -2,9 +2,7 @@
Exe
- netcoreapp3.1
1701;1702;1705;NU1701
- Bit.Setup