Fix namespaces to ensure we don't have Realm as a namespace (#3353)

realm · Jun 19, 2023 · 172c504 · 172c504
1 parent 1a19b92
commit 172c504
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,14 @@
 * None
 
 ### Fixed
+* Fixed a namespacing issue that would cause Unity projects to fail to build due to `'Realm' is a namespace but is used like a type`. (Issue [#3351](https://github.com/realm/realm-dotnet/issues/3351))
 * Improved the warning message when adding Realm attributes on a non-persisted property. (Issue [#3352](https://github.com/realm/realm-dotnet/issues/3352))
 
 ### Compatibility
 * Realm Studio: 13.0.0 or later.
 
 ### Internal
-* Using Core x.y.z.
+* Using Core 13.15.0.
 
 ## 11.1.0 (2023-06-17)
 

diff --git a/Realm/Realm.UnityUtils/DeviceInfo.cs b/Realm/Realm.UnityUtils/DeviceInfo.cs
@@ -19,7 +19,7 @@
 using Realms.PlatformHelpers;
 using UnityEngine;
 
-namespace Realm.UnityUtils
+namespace UnityUtils
 {
     internal class UnityDeviceInfo : IDeviceInfo
     {

diff --git a/Realm/Realm.UnityUtils/Initializer.cs b/Realm/Realm.UnityUtils/Initializer.cs
@@ -17,7 +17,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 using System.Threading;
-using Realm.UnityUtils;
 using Realms;
 using Realms.PlatformHelpers;
 using UnityEngine;

diff --git a/Realm/Realm.UnityUtils/Realm.UnityUtils.csproj b/Realm/Realm.UnityUtils/Realm.UnityUtils.csproj
@@ -11,6 +11,7 @@
     <NoWarn>1701;1702;NU1701</NoWarn>
     <Nullable>enable</Nullable>
     <LangVersion>9.0</LangVersion>
+    <RootNamespace>UnityUtils</RootNamespace>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/Tests/SourceGenerators/Realm.SourceGenerator.Tests/Program.cs b/Tests/SourceGenerators/Realm.SourceGenerator.Tests/Program.cs
@@ -19,7 +19,7 @@
 using NUnitLite;
 using Realms.Tests;
 
-namespace Realm.SourceGenerator.Tests
+namespace Realms.SourceGenerator.Tests
 {
     public class Program
     {

diff --git a/Tests/SourceGenerators/Realm.SourceGenerator.Tests/UtilsTests.cs b/Tests/SourceGenerators/Realm.SourceGenerator.Tests/UtilsTests.cs
@@ -18,7 +18,7 @@
 
 using Realms.SourceGenerator;
 
-namespace Realm.SourceGenerator.Tests
+namespace Realms.SourceGenerator.Tests
 {
     [TestFixture]
     internal class UtilsTests