Merge branch 'improved-props'

Author: Rabadash8820

README.md

@@ -34,14 +34,24 @@ _Unity® and the Unity logo are trademarks of Unity Technologies._
 ## Basic Usage
 
 ```xml
+<!-- Directory.Build.props -->
+<Project>
+    <PropertyGroup>
+        <UnityVersion>2022.1.1f1</UnityVersion>
+    </PropertyGroup>
+</Project>
+```
+
+```xml
+<!-- Your .csproj file -->
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <UnityVersion>2021.2.2f1</UnityVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Unity3D" Version="1.7.0" />
+        <PackageReference Include="Unity3D" Version="2.0.0-rc1" />
     </ItemGroup>
+    <!-- Other properties/items -->
 </Project>
 ```
 

nupkg/Unity3D.nuspec

@@ -2,17 +2,27 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
   <metadata minClientVersion="2.5">
     <id>Unity3D</id>
-    <version>1.7.0</version>
+    <version>2.0.0-rc1</version>
+    <title>Unity</title>
     <authors>Unity Technologies</authors>
-    <owners>DerploidEntertainment</owners>
     <icon>icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/DerploidEntertainment/UnityAssemblies</projectUrl>
     <description>Simple, forward-compatible references to ANY Unity assembly on ANY platform.</description>
-    <releaseNotes>Added root paths for Linux</releaseNotes>
-    <copyright>Copyright ©2019-2021 Derploid Entertainment, LLC</copyright>
+    <readme>README.md</readme>
+    <releaseNotes>
+      - Unity version can now be parsed automatically from the ProjectVersion.txt file in a Unity project, if not set explicitly.
+      - Added many new short-hand properties, with better naming (relative paths end in "Dir" or "Assembly", absolute paths end in "Path")
+      - Reference Include paths no longer need to start with $(UnityInstallRoot)/$(UnityVersion). Most paths will now use a single short-hand property
+      - If neither UnityVersion nor UnityProjectPath are explicitly set, then UnityVersion is set to a constant string to explain the issue
+    </releaseNotes>
+    <copyright>Copyright ©2019-2022 Derploid Entertainment, LLC</copyright>
     <tags>Unity Unity3D UnityEngine UnityEditor</tags>
     <repository type="git" url="https://github.com/DerploidEntertainment/UnityAssemblies.git" />
   </metadata>
+  <files>
+    <file src="..\README.md" target="" />
+    <file src=".\**\*.*" target="" />
+  </files>
 </package>

nupkg/build/Unity3D.props

@@ -1,63 +1,106 @@
 <Project>
 
-  <!-- Set default Unity folder paths -->
+  <!-- Set OS-specific absolte/relative folder paths -->
   <Choose>
     <When Condition="$([MSBuild]::IsOsPlatform(Windows))">
       <PropertyGroup>
         <OSInstallRoot Condition="'$(OSInstallRoot)'==''">C:\Program Files</OSInstallRoot>
-        <UnityManagedPath Condition="'$(UnityManagedPath)'==''">Editor\Data\Managed</UnityManagedPath>
-        <UnityExtensionsPath Condition="'$(UnityExtensionsPath)'==''">Editor\Data\UnityExtensions\Unity</UnityExtensionsPath>
+        <UnityManagedDir Condition="'$(UnityManagedDir)'==''">Editor\Data\Managed</UnityManagedDir>
+        <UnityExtensionsDir Condition="'$(UnityExtensionsDir)'==''">Editor\Data\UnityExtensions\Unity</UnityExtensionsDir>
       </PropertyGroup>
     </When>
     <When Condition="$([MSBuild]::IsOsPlatform(OSX))">
       <PropertyGroup>
         <OSInstallRoot Condition="'$(OSInstallRoot)'==''">/Applications</OSInstallRoot>
-        <UnityManagedPath Condition="'$(UnityManagedPath)'==''">Unity.app\Contents\Managed</UnityManagedPath>
-        <UnityExtensionsPath Condition="'$(UnityExtensionsPath)'==''">Unity.app\Contents\UnityExtensions\Unity</UnityExtensionsPath>
+        <UnityManagedDir Condition="'$(UnityManagedDir)'==''">Unity.app\Contents\Managed</UnityManagedDir>
+        <UnityExtensionsDir Condition="'$(UnityExtensionsDir)'==''">Editor\Unity.app\Contents\UnityExtensions\Unity</UnityExtensionsDir>
       </PropertyGroup>
     </When>
     <When Condition="$([MSBuild]::IsOsPlatform(Linux))">
       <PropertyGroup>
         <OSInstallRoot Condition="'$(OSInstallRoot)'==''">$([System.Environment]::GetFolderPath('System.Environment+SpecialFolder.UserProfile'))</OSInstallRoot>
-        <UnityManagedPath Condition="'$(UnityManagedPath)'==''">Editor\Data\Managed</UnityManagedPath>
-        <UnityExtensionsPath Condition="'$(UnityExtensionsPath)'==''">Editor\Data\UnityExtensions\Unity</UnityExtensionsPath>
+        <UnityManagedDir Condition="'$(UnityManagedDir)'==''">Editor\Data\Managed</UnityManagedDir>
+        <UnityExtensionsDir Condition="'$(UnityExtensionsDir)'==''">Editor\Data\UnityExtensions\Unity</UnityExtensionsDir>
       </PropertyGroup>
     </When>
   </Choose>
+
+  <!--
+    Parse editor version from ProjectVersion.txt file in Unity project. Its contents look like this (minus indent):
+        m_EditorVersion: 2021.3.2f1
+        m_EditorVersionWithRevision: 2021.3.2f1 (d6360bedb9a0)
+
+    We first condense this to single "CSV" line, e.g.: m_EditorVersion,2021.3.2f1,m_EditorVersionWithRevision,2021.3.2f1 (d6360bedb9a0)
+    Then pluck out the versions by splitting on comma
+  -->
+  <PropertyGroup Condition="'$(UnityVersion)'=='' And '$(UnityProjectPath)'!=''">
+    <UnityProjectVersionTxt>$([System.IO.File]::ReadAllText(`$(UnityProjectPath)\ProjectSettings\ProjectVersion.txt`))</UnityProjectVersionTxt>
+    <UnityProjectVersionCsv>$([System.Text.RegularExpressions.Regex]::Replace(`$(UnityProjectVersionTxt)`, `\r\n|\r|\n|: `, `,`))</UnityProjectVersionCsv>
+    <UnityVersion>$(UnityProjectVersionCsv.Split(`,`)[1].Trim())</UnityVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(UnityVersion)'=='' And '$(UnityProjectPath)'==''">
+    <UnityVersion>SET_VERSION_OR_PROJECT</UnityVersion>
+  </PropertyGroup>
+
+  <!-- Set default Unity absolte/relative folder paths -->
   <PropertyGroup>
-    <UnityInstallRoot Condition="'$(UnityInstallRoot)'==''">$(OSInstallRoot)\Unity\Hub\Editor</UnityInstallRoot>
-    <UnityModulesPath Condition="'$(UnityModulesPath)'==''">$(UnityManagedPath)\UnityEngine</UnityModulesPath>
-    <UnityPlaybackEnginesPath Condition="'$(UnityPlaybackEnginesPath)'==''">Editor\Data\PlaybackEngines</UnityPlaybackEnginesPath>
-    <UnityAndroidPlayerPath Condition="'$(UnityAndroidPlayerPath)'==''">$(UnityPlaybackEnginesPath)\AndroidPlayer</UnityAndroidPlayerPath>
-    <UnityiOSSupportPath Condition="'$(UnityiOSSupportPath)'==''">$(UnityPlaybackEnginesPath)\iOSSupport</UnityiOSSupportPath>
-    <UnityBuiltInPackagesPath Condition="'$(UnityBuiltInPackagesPath)'==''">Editor\Data\Resources\PackageManager\BuiltInPackages</UnityBuiltInPackagesPath>
-
-    <UnityPackageCachePath Condition="'$(UnityPackageCachePath)'==''">Library\PackageCache</UnityPackageCachePath>
-    <UnityScriptAssembliesPath Condition="'$(UnityScriptAssembliesPath)'==''">Library\ScriptAssemblies</UnityScriptAssembliesPath>
+    <UnityInstallRootDir Condition="'$(UnityInstallRootDir)'==''">Unity\Hub\Editor</UnityInstallRootDir>
+    <UnityInstallRoot Condition="'$(UnityInstallRoot)'==''">$(OSInstallRoot)\$(UnityInstallRootDir)</UnityInstallRoot>
+
+    <UnityVersionInstallPath Condition="'$(UnityVersionInstallPath)'==''">$(UnityInstallRoot)\$(UnityVersion)</UnityVersionInstallPath>
+    <UnityManagedPath Condition="'$(UnityManagedPath)'==''">$(UnityVersionInstallPath)\$(UnityManagedDir)</UnityManagedPath>
+    <UnityExtensionsPath Condition="'$(UnityExtensionsPath)'==''">$(UnityVersionInstallPath)\$(UnityExtensionsDir)</UnityExtensionsPath>
+
+    <UnityModulesDir Condition="'$(UnityModulesDir)'==''">UnityEngine</UnityModulesDir>
+    <UnityModulesPath Condition="'$(UnityModulesPath)'==''">$(UnityManagedPath)\$(UnityModulesDir)</UnityModulesPath>
+
+    <UnityPlaybackEnginesDir Condition="'$(UnityPlaybackEnginesDir)'==''">Editor\Data\PlaybackEngines</UnityPlaybackEnginesDir>
+    <UnityAndroidPlayerDir Condition="'$(UnityAndroidPlayerDir)'==''">$(UnityPlaybackEnginesDir)\AndroidPlayer</UnityAndroidPlayerDir>
+    <UnityiOSSupportDir Condition="'$(UnityiOSSupportDir)'==''">$(UnityPlaybackEnginesDir)\iOSSupport</UnityiOSSupportDir>
+    <UnityPlaybackEnginesPath Condition="'$(UnityPlaybackEnginesPath)'==''">$(UnityVersionInstallPath)\$(UnityPlaybackEnginesDir)</UnityPlaybackEnginesPath>
+    <UnityAndroidPlayerPath Condition="'$(UnityAndroidPlayerPath)'==''">$(UnityVersionInstallPath)\$(UnityAndroidPlayerDir)</UnityAndroidPlayerPath>
+    <UnityiOSSupportPath Condition="'$(UnityiOSSupportPath)'==''">$(UnityVersionInstallPath)\$(UnityiOSSupportDir)</UnityiOSSupportPath>
+
+    <UnityBuiltInPackagesDir Condition="'$(UnityBuiltInPackagesDir)'==''">Editor\Data\Resources\PackageManager\BuiltInPackages</UnityBuiltInPackagesDir>
+    <UnityBuiltInPackagesPath Condition="'$(UnityBuiltInPackagesPath)'==''">$(UnityVersionInstallPath)\$(UnityBuiltInPackagesDir)</UnityBuiltInPackagesPath>
+
+    <UnityPackageCacheDir Condition="'$(UnityPackageCacheDir)'==''">Library\PackageCache</UnityPackageCacheDir>
+    <UnityPackageCachePath Condition="'$(UnityPackageCachePath)'==''">$(UnityProjectPath)\$(UnityPackageCacheDir)</UnityPackageCachePath>
+
+    <UnityScriptAssembliesDir Condition="'$(UnityScriptAssembliesDir)'==''">Library\ScriptAssemblies</UnityScriptAssembliesDir>
+    <UnityScriptAssembliesPath Condition="'$(UnityScriptAssembliesPath)'==''">$(UnityProjectPath)\$(UnityScriptAssembliesDir)</UnityScriptAssembliesPath>
   </PropertyGroup>
 
-  <!-- Set relative paths of specific Unity assemblies -->
+  <!-- Set default paths of specific Unity assemblies -->
   <PropertyGroup>
     <UnityEnginePath Condition="'$(UnityEnginePath)'==''">$(UnityManagedPath)\UnityEngine.dll</UnityEnginePath>
     <UnityEditorPath Condition="'$(UnityEditorPath)'==''">$(UnityManagedPath)\UnityEditor.dll</UnityEditorPath>
     <UnityEngineUIPath Condition="'$(UnityEngineUIPath)'==''">$(UnityExtensionsPath)\GUISystem\UnityEngine.UI.dll</UnityEngineUIPath>
     <UnityEngineTestRunnerPath Condition="'$(UnityEngineTestRunnerPath)'==''">$(UnityExtensionsPath)\TestRunner\UnityEngine.TestRunner.dll</UnityEngineTestRunnerPath>
   </PropertyGroup>
 
-  <!-- Set relative paths of specific PackageCache assemblies -->
+  <!-- Set default paths of specific PackageCache assemblies -->
   <PropertyGroup>
-    <NewtonsoftJsonPath Condition="'$(NewtonsoftJsonPath)'==''">$(UnityPackageCachePath)\com.unity.nuget.newtonsoft-json*\Runtime\Newtonsoft.Json.dll</NewtonsoftJsonPath>
-    <NunitPath Condition="'$(NunitPath)'==''">$(UnityPackageCachePath)\com.unity.ext.nunit*\net35\unity-custom\nunit.framework.dll</NunitPath>
-    <MoqPath Condition="'$(MoqPath)'==''">$(UnityPackageCachePath)\nuget.moq*\Moq.dll</MoqPath>
-    <UnityAnalyticsStandardEventsPath Condition="'$(UnityAnalyticsStandardEventsPath)'==''">$(UnityPackageCachePath)\com.unity.analytics*\AnalyticsStandardEvents\Unity.Analytics.StandardEvents.dll</UnityAnalyticsStandardEventsPath>
+    <NewtonsoftJsonAssembly Condition="'$(NewtonsoftJsonAssembly)'==''">com.unity.nuget.newtonsoft-json*\Runtime\Newtonsoft.Json.dll</NewtonsoftJsonAssembly>
+    <NewtonsoftJsonPath Condition="'$(NewtonsoftJsonPath)'==''">$(UnityPackageCachePath)\$(NewtonsoftJsonAssembly)</NewtonsoftJsonPath>
+
+    <NunitAssembly Condition="'$(NunitAssembly)'==''">com.unity.ext.nunit*\net35\unity-custom\nunit.framework.dll</NunitAssembly>
+    <NunitPath Condition="'$(NunitPath)'==''">$(UnityPackageCachePath)\$(NunitAssembly)</NunitPath>
+
+    <MoqAssembly Condition="'$(MoqAssembly)'==''">nuget.moq*\Moq.dll</MoqAssembly>
+    <MoqPath Condition="'$(MoqPath)'==''">$(UnityPackageCachePath)\$(MoqAssembly)</MoqPath>
+
+    <UnityAnalyticsStandardEventsAssembly Condition="'$(UnityAnalyticsStandardEventsAssembly)'==''">com.unity.analytics*\AnalyticsStandardEvents\Unity.Analytics.StandardEvents.dll</UnityAnalyticsStandardEventsAssembly>
+    <UnityAnalyticsStandardEventsPath Condition="'$(UnityAnalyticsStandardEventsPath)'==''">$(UnityPackageCachePath)\$(UnityAnalyticsStandardEventsAssembly)</UnityAnalyticsStandardEventsPath>
+
     <UnityEditorAndroidExtensionsPath Condition="'$(UnityEditorAndroidExtensionsPath)'==''">$(UnityAndroidPlayerPath)\UnityEditor.Android.Extensions.dll</UnityEditorAndroidExtensionsPath>
     <UnityEditoriOSExtensionsCommonPath Condition="'$(UnityEditoriOSExtensionsCommonPath)'==''">$(UnityiOSSupportPath)\UnityEditor.iOS.Extensions.Common.dll</UnityEditoriOSExtensionsCommonPath>
     <UnityEditoriOSExtensionsXcodePath Condition="'$(UnityEditoriOSExtensionsXcodePath)'==''">$(UnityiOSSupportPath)\UnityEditor.iOS.Extensions.Xcode.dll</UnityEditoriOSExtensionsXcodePath>
   </PropertyGroup>
 
   <!-- Add default Unity references -->
   <ItemGroup>
-    <Reference Include="$(UnityInstallRoot)\$(UnityVersion)\$(UnityEnginePath)" Private="false" />
+    <Reference Include="$(UnityEnginePath)" Private="false" />
   </ItemGroup>
 
 </Project>

nupkg/readme.txt

@@ -20,16 +20,23 @@
 
 Thank you for installing the Unity3D NuGet package!
 
-Example .csproj file (using Unity 2021.2.2f1, targeting .NET Standard 2.1 profile):
+To use this package, define a Directory.Build.props file in the same folder as your .csproj file (or any of its parent folders),
+replacing the Unity version with your version:
+
+    <Project>
+        <UnityVersion>2022.1.1f1</UnityVersion>
+    </Project
+
+Then, make sure your .csproj file looks something like this:
 
     <Project Sdk="Microsoft.NET.Sdk">
         <PropertyGroup>
             <TargetFramework>netstandard2.1</TargetFramework>
-            <UnityVersion>2021.2.2f1</UnityVersion>
         </PropertyGroup>
         <ItemGroup>
-            <PackageReference Include="Unity3D" Version="1.7.0" />
+            <PackageReference Include="Unity3D" Version="2.0.0-rc1" />
         </ItemGroup>
+        <!-- Other properties/items -->
     </Project>
 
 For complete documentation, see our README on GitHub: https://github.com/DerploidEntertainment/UnityAssemblies/blob/master/README.md

publish.sh

@@ -1,9 +1,18 @@
 #!/bin/bash
 
+verifyReleaseNotes() {
+    echo ""
+    echo "Verify that the <releaseNotes/> element of nuspec is up-to-date"
+    echo ""
+    read -p "Press [Enter] when you're done..."
+}
+
 bumpVersions() {
+    echo ""
+
     # Get new version strings from user
     newPkgVersion=
-    prompt="Enter the new version (such as '1.0.0-rc1'): "
+    prompt="Enter the new package version (such as '1.0.0-rc1'): "
     read -p "$prompt" newPkgVersion
     while [ -z "$newPkgVersion" ] ; do
         echo "Package version string cannot be empty."
@@ -17,63 +26,80 @@ bumpVersions() {
         echo "Unity version string cannot be empty."
         read -p "$prompt" newUnityVersion
     done
-    
+
     # Update package version strings to the provided one
     echo ""
     echo "Changing package version strings to '$newPkgVersion' in:"
 
-    findTxt="PackageReference Include=\"Unity3D\""
-    replaceTxt="$findTxt Version=\"$newPkgVersion\" />"
+    findRegex="PackageReference Include=\"Unity3D\""
+    replaceTxt="$findRegex Version=\"$newPkgVersion\" />"
 
     pkgReadmePath=$cwd/nupkg/readme.txt
     echo "    Sample project file in '$pkgReadmePath'..."
-    sed --expression="s|$findTxt.*|$replaceTxt|" --in-place "$pkgReadmePath"
+    sed --expression="s|$findRegex.*|$replaceTxt|" --in-place "$pkgReadmePath"
     errNum=$?
     if [ $errNum != 0 ]; then return $errNum; fi
 
     mainReadmePath=$cwd/README.md
     echo "    Sample project file at top of '$mainReadmePath'..."
-    sed --expression="s|$findTxt.*|$replaceTxt|" --in-place "$mainReadmePath"
+    sed --expression="s|$findRegex.*|$replaceTxt|" --in-place "$mainReadmePath"
     errNum=$?
     if [ $errNum != 0 ]; then return $errNum; fi
 
-    findTxt="<version>"
-    replaceTxt="$findTxt$newPkgVersion</version>"
+    findRegex="<version>"
+    replaceTxt="$findRegex$newPkgVersion</version>"
 
     nuspecPath=$cwd/nupkg/Unity3D.nuspec
     echo "    Nuspec at '$nuspecPath'..."
-    sed --expression="s|$findTxt.*|$replaceTxt|" --in-place "$nuspecPath"
+    sed --expression="s|$findRegex.*|$replaceTxt|" --in-place "$nuspecPath"
     errNum=$?
     if [ $errNum != 0 ]; then return $errNum; fi
 
-    # Update Unity version strings to the provided one    
+    # Update Unity version strings to the provided one
     echo "Changing Unity version strings to '$newUnityVersion' in:"
 
-    findTxt="<UnityVersion>"
-    replaceTxt="$findTxt$newUnityVersion</UnityVersion>"
+    findRegex="using Unity .*,"
+    replaceTxt="using Unity $newUnityVersion,"
+
+    echo "    Sample project file description in '$pkgReadmePath'..."
+    sed --expression="s|$findRegex|$replaceTxt|" --in-place "$pkgReadmePath"
+    errNum=$?
+    if [ $errNum != 0 ]; then return $errNum; fi
+
+    findRegex="<UnityVersion>"
+    replaceTxt="$findRegex$newUnityVersion</UnityVersion>"
 
     echo "    Sample project file in '$pkgReadmePath'..."
-    sed --expression="s|$findTxt.*|$replaceTxt|" --in-place "$pkgReadmePath"
+    sed --expression="s|$findRegex.*|$replaceTxt|" --in-place "$pkgReadmePath"
     errNum=$?
     if [ $errNum != 0 ]; then return $errNum; fi
 
     mainReadmePath=$cwd/README.md
     echo "    Sample project files in '$mainReadmePath'..."
-    sed --expression="s|$findTxt.*|$replaceTxt|" --in-place "$mainReadmePath"
+    sed --expression="s|$findRegex.*|$replaceTxt|" --in-place "$mainReadmePath"
     errNum=$?
     if [ $errNum != 0 ]; then return $errNum; fi
-
-    echo ""
-    echo "Commit the version string changes that we just made"
-    echo ""
-    read -p "Press [Enter] when you're done..."
 }
 
-verifyReleaseNotes() {
+bumpCurrentYear() {
+    defaultCopyrightStartYear=2019
     echo ""
-    echo "Verify that the <releaseNotes/> element of nuspec is up-to-date"
+    read -p "Enter the 'start year' of the copyright for this package (or hit [ENTER] to use '$defaultCopyrightStartYear'): " copyrightStartYear
+    if [ -z "$copyrightStartYear" ]; then copyrightStartYear=$defaultCopyrightStartYear; fi
+
+    currentYear=$(date +'%Y')
+
     echo ""
-    read -p "Press [Enter] when you're done..."
+    echo "Updating current year to '$currentYear' in:"
+
+    findRegex="[0-9]{4}-[0-9]{4}"
+    replaceTxt="$copyrightStartYear-$currentYear"
+
+    nuspecPath=$cwd/nupkg/Unity3D.nuspec
+    echo "    Nuspec at '$nuspecPath'..."
+    sed --regexp-extended --expression="s|$findRegex|$replaceTxt|" --in-place "$nuspecPath"
+    errNum=$?
+    if [ $errNum != 0 ]; then return $errNum; fi
 }
 
 checkForNuGet() {
@@ -160,7 +186,12 @@ main() {
     cwd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
     # Make sure user has updated package info
-    bumpVersions && verifyReleaseNotes
+    verifyReleaseNotes && bumpVersions && bumpCurrentYear
+
+    echo ""
+    echo "Commit the changes to version/year that this script just made"
+    echo ""
+    read -p "Press [Enter] when you're done..."
 
     # Get the path to nuget.exe
     checkForNuGet

test/Directory.Build.props

@@ -1,7 +1,5 @@
 <Project>
 
-  <Import Project= "..\nupkg\build\Unity3D.props"/>
-
   <PropertyGroup>
     <Configurations>
       Standard21_2021_3;Net472_2021_3;Net48_2021_3;

test/TestAllRefs/Test.cs

@@ -72,8 +72,10 @@
 #define UNITYENGINE_DEVICE_AVAILABLE
 #endif
 
-namespace Unity3D.Test {
-    public class TestBehaviour : UnityEngine.MonoBehaviour {
+namespace Unity3D.Test
+{
+    public class TestBehaviour : UnityEngine.MonoBehaviour
+    {
         public UnityEngine.UI.Text TextField;
         public UnityEngine.TestTools.TestPlatform TestPlatformField;
         public UnityEditor.Android.AndroidPlatformIconKind AndroidPlatformIconKind;
@@ -96,7 +98,8 @@ public class TestEditor : UnityEditor.Editor { }
 #if NUNIT_AVAILABLE
     [NUnit.Framework.TestFixture]
 #endif
-    public class TestFixture {
+    public class TestFixture
+    {
 #if MOQ_AVAILABLE
         public Moq.Mock<TestBehaviour> Mock;
 #endif