diff --git a/Assets/Package/Lib/GitRepositoryManager.dll b/Assets/Package/Lib/GitRepositoryManager.dll index d56c649..5cbb2e7 100644 Binary files a/Assets/Package/Lib/GitRepositoryManager.dll and b/Assets/Package/Lib/GitRepositoryManager.dll differ diff --git a/Assets/Package/Lib/GitRepositoryManager.dll.meta b/Assets/Package/Lib/GitRepositoryManager.dll.meta index a9d6dd2..ce7ab5d 100644 --- a/Assets/Package/Lib/GitRepositoryManager.dll.meta +++ b/Assets/Package/Lib/GitRepositoryManager.dll.meta @@ -11,65 +11,17 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Editor: 0 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - first: Any: second: - enabled: 0 + enabled: 1 settings: {} - first: Editor: Editor - second: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 second: enabled: 0 settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU + DefaultValueInitialized: true - first: Windows Store Apps: WindowsStoreApps second: diff --git a/Assets/Package/RepoManagerWindow.cs b/Assets/Package/RepoManagerWindow.cs index e3f4c3b..d76db37 100644 --- a/Assets/Package/RepoManagerWindow.cs +++ b/Assets/Package/RepoManagerWindow.cs @@ -5,6 +5,7 @@ using System.IO; using UnityEditor; using UnityEditor.AnimatedValues; +using UnityEditor.Callbacks; using UnityEngine; namespace GitRepositoryManager @@ -37,6 +38,8 @@ private class DependencyInfo private bool showWarningMessage; private bool lastFrameWasWaitingToShowWarning; + private const string FULL_RE_IMPORT_KEY = "RepositoryManager.FullReImport"; + private HashSet _reposWereBusy = new HashSet(); private HashSet _reposBusy = new HashSet(); @@ -106,7 +109,10 @@ private void UpdateDependencies(List updatedDependencies = null) RepoPanel panel = new RepoPanel(_repoPath, dependency, GetPlatformAuthentication()); panel.OnRemovalRequested += OnPanelRemovalRequested; panel.OnDeleteAssetsRequested += DeleteAssets; - panel.OnCopyFinished += UpdateAssetDatabaseForNewAssets; + panel.OnCopyFinished += (assets, updatedRepos) => + { + UpdateAssetDatabaseForNewAssets(assets, EditorPrefs.GetBool(FULL_RE_IMPORT_KEY, true), updatedRepos); + }; _repoPanels.Add(panel); } } @@ -153,26 +159,33 @@ private void DeleteAssets(List toDelete) //Debug.Log("Evaluating next directory " + parentDir.FullName); } } - } } - private void UpdateAssetDatabaseForNewAssets(List coppiedAssets, params RepoPanel[] updatedRepos) + private void UpdateAssetDatabaseForNewAssets(List coppiedAssets, bool fullReImport, params RepoPanel[] updatedRepos) { - //Update all assets individually to avoid a full editor re-import - for (int i = 0; i < coppiedAssets.Count; i++) + if (fullReImport) { - string extension = Path.GetExtension(coppiedAssets[i]); - if (extension == ".meta") + EditorUtility.DisplayProgressBar("Importing Repositories", "Performing full re-import" + GUIUtility.GetLoadingDots(), (float)EditorApplication.timeSinceStartup % 1); + AssetDatabase.Refresh(); + } + else + { + //Update all assets individually to avoid a full editor re-import + for (int i = 0; i < coppiedAssets.Count; i++) { - //dont import meta files directly. - continue; - } + string extension = Path.GetExtension(coppiedAssets[i]); + if (extension == ".meta") + { + //dont import meta files directly. + continue; + } - string assetDBPath = GetAssetDatabasePathFromFullPath(coppiedAssets[i]); + string assetDBPath = GetAssetDatabasePathFromFullPath(coppiedAssets[i]); - EditorUtility.DisplayProgressBar("Importing Repositories", "Importing repositories into project. Please wait a moment" + GUIUtility.GetLoadingDots(), ((float)i) / coppiedAssets.Count); - AssetDatabase.ImportAsset(assetDBPath, ImportAssetOptions.ForceSynchronousImport); + EditorUtility.DisplayProgressBar("Importing Repositories", "Importing repositories into project. Please wait a moment" + GUIUtility.GetLoadingDots(), ((float)i) / coppiedAssets.Count); + AssetDatabase.ImportAsset(assetDBPath, ImportAssetOptions.ForceSynchronousImport); + } } //snapshot folder and file state to compare against later! @@ -290,7 +303,7 @@ private void UpdateEditor() if(coppiedAssets.Count > 0) { - UpdateAssetDatabaseForNewAssets(coppiedAssets, updatedRepos.ToArray()); + UpdateAssetDatabaseForNewAssets(coppiedAssets, EditorPrefs.GetBool(FULL_RE_IMPORT_KEY, true), updatedRepos.ToArray()); } if (repaint) @@ -308,6 +321,9 @@ private ICredentialManager GetPlatformAuthentication() private void OnGUI() { + bool reImport = EditorGUILayout.Toggle("Full Re-Import", EditorPrefs.GetBool(FULL_RE_IMPORT_KEY, true)); + EditorPrefs.SetBool(FULL_RE_IMPORT_KEY, reImport); + Rect labelRect = EditorGUILayout.GetControlRect(); labelRect.y += labelRect.height / 2f; diff --git a/Assets/Repositories/ContentEngine.meta b/Assets/Repositories/ContentEngine.meta new file mode 100644 index 0000000..ea08722 --- /dev/null +++ b/Assets/Repositories/ContentEngine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf6ef3e2168572f4d9dc21db53c7ddad +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Plugin/Src/Repository.cs b/Plugin/Src/Repository.cs index 0086124..f2998fc 100644 --- a/Plugin/Src/Repository.cs +++ b/Plugin/Src/Repository.cs @@ -239,7 +239,6 @@ List DirectoryCopy(string sourceDirName, string destDirName, string[] fo } } - public void CopyBackChanges() { //Swapped from forward copy. Other logic can stay the same. @@ -298,6 +297,7 @@ void DirectoryCopy(string sourceDirName, string destDirName) } } } + public void CancelUpdate() { if(_inProgress) _cancellationPending = true; @@ -324,7 +324,6 @@ public bool LastOperationSuccess } } - public bool CancellationPending { get @@ -380,13 +379,13 @@ private void UpdateTask(object stateInfo) FetchOptions fetchOptions = new FetchOptions() { - TagFetchMode = TagFetchMode.All, + /*TagFetchMode = TagFetchMode.All, OnTransferProgress = new LibGit2Sharp.Handlers.TransferProgressHandler((progress) => { _progressQueue.Enqueue(new Progress(((float)progress.ReceivedObjects) / progress.TotalObjects, "Fetching " + progress.ReceivedObjects + "/" + progress.TotalObjects + "(" + progress.ReceivedBytes + " bytes )")); return _cancellationPending; - }), + }),*/ CredentialsProvider = (credsUrl, user, supportedCredentials) => { state.CredentialManager.GetCredentials(credsUrl, user, supportedCredentials, out var credentials, out string message); @@ -401,10 +400,10 @@ private void UpdateTask(object stateInfo) //Repo exists we are doing a pull using (var repo = new LibGit2Sharp.Repository(state.LocalDestination)) { - _progressQueue.Enqueue(new Progress(0, "Nuking local changes. Checking out " + state.Branch)); + //_progressQueue.Enqueue(new Progress(0, "Nuking local changes. Checking out " + state.Branch)); - Branch branch = repo.Branches[state.Branch]; - Commands.Checkout(repo, branch, new CheckoutOptions() { CheckoutModifiers = CheckoutModifiers.Force, CheckoutNotifyFlags = CheckoutNotifyFlags.None}); + //Branch branch = repo.Branches[state.Branch]; + //Commands.Checkout(repo, branch, new CheckoutOptions() { CheckoutModifiers = CheckoutModifiers.Force, CheckoutNotifyFlags = CheckoutNotifyFlags.None}); // Credential information to fetch PullOptions options = new PullOptions @@ -414,7 +413,7 @@ private void UpdateTask(object stateInfo) // User information to create a merge commit. Should not happen as we force checkout before pulling. var signature = new LibGit2Sharp.Signature( - new Identity("MergeNotAllowed", "MergeNotAllowed@MergeMail.com"), DateTimeOffset.Now); + new Identity("RepositoryManager", "repositorymanager@mergemail.com"), DateTimeOffset.Now); try { @@ -428,6 +427,37 @@ private void UpdateTask(object stateInfo) _progressQueue.Enqueue(new Progress(0, "Pull failed: " + e.Message)); _lastOperationSuccess = false; } + + /*try + { + var remote = repo.Network.Remotes["origin"]; + var refSpecs = remote.FetchRefSpecs.Select(x => x.Specification); + + _progressQueue.Enqueue(new Progress(0, "Fetching from " + remote.Name)); + + Commands.Fetch(repo, remote.Name, refSpecs, fetchOptions, ""); + + _progressQueue.Enqueue(new Progress(1, "Complete")); + + try + { + Branch branch = repo.Branches["origin/" + state.Branch]; + var signature = new Signature(new Identity("RepositoryManager", "Repositorymanager@Mergemail.com"), DateTimeOffset.Now); + repo.Merge(branch, signature); + + _lastOperationSuccess = true; + } + catch (Exception e) + { + _progressQueue.Enqueue(new Progress(0, "Merge failed: " + e.Message)); + _lastOperationSuccess = false; + } + } + catch (Exception e) + { + _progressQueue.Enqueue(new Progress(0, "Fetch failed: " + e.Message)); + _lastOperationSuccess = false; + }*/ } } else @@ -471,6 +501,20 @@ private void UpdateTask(object stateInfo) } } + if(LastOperationSuccess) + { + _progressQueue.Enqueue(new Progress(1, "Downloading LFS files")); + try + { + InstallAndPullLFS(state.LocalDestination); + } + catch(Exception e) + { + _progressQueue.Enqueue(new Progress(0, "LFS Pull failed: " + e.Message)); + _lastOperationSuccess = false; + } + } + //Once completed _inProgress = false; _cancellationPending = false; @@ -486,5 +530,52 @@ public void OpenRepositoryDestination() }); //Leave the process running. User should close it manually. } + + public void InstallAndPullLFS(string path) + { + //Install lfs + ProcessStartInfo installStartInfo = new ProcessStartInfo + { + FileName = "git-lfs", + Arguments = "install", + WorkingDirectory = path, + UseShellExecute = false, + WindowStyle = ProcessWindowStyle.Hidden, + CreateNoWindow = true, + RedirectStandardInput = true, + RedirectStandardOutput = true, + RedirectStandardError = true + }; + + Process installProcess = new Process + { + StartInfo = installStartInfo + }; + + installProcess.Start(); + installProcess.WaitForExit(); + + //Now pull lfs + ProcessStartInfo pullStartInfo = new ProcessStartInfo + { + FileName = "git-lfs", + Arguments = "pull", + WorkingDirectory = path, + UseShellExecute = false, + WindowStyle = ProcessWindowStyle.Hidden, + CreateNoWindow = true, + RedirectStandardInput = true, + RedirectStandardOutput = true, + RedirectStandardError = true + }; + + Process pullProcess = new Process + { + StartInfo = pullStartInfo + }; + + pullProcess.Start(); + pullProcess.WaitForExit(); + } } } diff --git a/Plugin/obj/project.assets.json b/Plugin/obj/project.assets.json new file mode 100644 index 0000000..abdafe3 --- /dev/null +++ b/Plugin/obj/project.assets.json @@ -0,0 +1,383 @@ +{ + "version": 3, + "targets": { + ".NETStandard,Version=v2.0": { + "LibGit2Sharp/0.26.2": { + "type": "package", + "dependencies": { + "LibGit2Sharp.NativeBinaries": "[2.0.306]" + }, + "compile": { + "lib/netstandard2.0/LibGit2Sharp.dll": {} + }, + "runtime": { + "lib/netstandard2.0/LibGit2Sharp.dll": {} + } + }, + "LibGit2Sharp.NativeBinaries/2.0.306": { + "type": "package", + "build": { + "build/LibGit2Sharp.NativeBinaries.props": {} + }, + "buildMultiTargeting": { + "buildMultiTargeting/LibGit2Sharp.NativeBinaries.props": {} + }, + "runtimeTargets": { + "runtimes/alpine-x64/native/libgit2-106a5f2.so": { + "assetType": "native", + "rid": "alpine-x64" + }, + "runtimes/alpine.3.9-x64/native/libgit2-106a5f2.so": { + "assetType": "native", + "rid": "alpine.3.9-x64" + }, + "runtimes/debian-arm64/native/libgit2-106a5f2.so": { + "assetType": "native", + "rid": "debian-arm64" + }, + "runtimes/debian.9-x64/native/libgit2-106a5f2.so": { + "assetType": "native", + "rid": "debian.9-x64" + }, + "runtimes/fedora-x64/native/libgit2-106a5f2.so": { + "assetType": "native", + "rid": "fedora-x64" + }, + "runtimes/linux-x64/native/libgit2-106a5f2.so": { + "assetType": "native", + "rid": "linux-x64" + }, + "runtimes/osx/native/libgit2-106a5f2.dylib": { + "assetType": "native", + "rid": "osx" + }, + "runtimes/rhel-x64/native/libgit2-106a5f2.so": { + "assetType": "native", + "rid": "rhel-x64" + }, + "runtimes/ubuntu.16.04-arm64/native/libgit2-106a5f2.so": { + "assetType": "native", + "rid": "ubuntu.16.04-arm64" + }, + "runtimes/ubuntu.18.04-x64/native/libgit2-106a5f2.so": { + "assetType": "native", + "rid": "ubuntu.18.04-x64" + }, + "runtimes/win-x64/native/git2-106a5f2.dll": { + "assetType": "native", + "rid": "win-x64" + }, + "runtimes/win-x64/native/git2-106a5f2.pdb": { + "assetType": "native", + "rid": "win-x64" + }, + "runtimes/win-x86/native/git2-106a5f2.dll": { + "assetType": "native", + "rid": "win-x86" + }, + "runtimes/win-x86/native/git2-106a5f2.pdb": { + "assetType": "native", + "rid": "win-x86" + } + } + }, + "Microsoft.NETCore.Platforms/1.1.0": { + "type": "package", + "compile": { + "lib/netstandard1.0/_._": {} + }, + "runtime": { + "lib/netstandard1.0/_._": {} + } + }, + "NETStandard.Library/2.0.3": { + "type": "package", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + }, + "compile": { + "lib/netstandard1.0/_._": {} + }, + "runtime": { + "lib/netstandard1.0/_._": {} + }, + "build": { + "build/netstandard2.0/NETStandard.Library.targets": {} + } + } + } + }, + "libraries": { + "LibGit2Sharp/0.26.2": { + "sha512": "qHLhuI8VEtMf7jiurT/Ypquh37S6ngllCx+aq9uqOY2evok7Fb2AzhJgvNctsXOzHaJwveBs+30sPQJFn/pISg==", + "type": "package", + "path": "libgit2sharp/0.26.2", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "App_Readme/CHANGES.md", + "App_Readme/LICENSE.md", + "App_Readme/README.md", + "lib/net46/LibGit2Sharp.dll", + "lib/net46/LibGit2Sharp.pdb", + "lib/net46/LibGit2Sharp.xml", + "lib/netstandard2.0/LibGit2Sharp.dll", + "lib/netstandard2.0/LibGit2Sharp.pdb", + "lib/netstandard2.0/LibGit2Sharp.xml", + "libgit2sharp.0.26.2.nupkg.sha512", + "libgit2sharp.nuspec" + ] + }, + "LibGit2Sharp.NativeBinaries/2.0.306": { + "sha512": "LY9nyPE2X/eLl69ttuDPFFlKR8b5KXlqYej1YR1YmqmhF8Izo+vPX90q5ouOO5YGCf5d4lDUOC0x2yMWw00P7Q==", + "type": "package", + "path": "libgit2sharp.nativebinaries/2.0.306", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "build/LibGit2Sharp.NativeBinaries.props", + "build/net46/LibGit2Sharp.NativeBinaries.props", + "buildMultiTargeting/LibGit2Sharp.NativeBinaries.props", + "libgit2/LibGit2Sharp.dll.config", + "libgit2/libgit2.license.txt", + "libgit2/libgit2_hash.txt", + "libgit2sharp.nativebinaries.2.0.306.nupkg.sha512", + "libgit2sharp.nativebinaries.nuspec", + "runtimes/alpine-x64/native/libgit2-106a5f2.so", + "runtimes/alpine.3.9-x64/native/libgit2-106a5f2.so", + "runtimes/debian-arm64/native/libgit2-106a5f2.so", + "runtimes/debian.9-x64/native/libgit2-106a5f2.so", + "runtimes/fedora-x64/native/libgit2-106a5f2.so", + "runtimes/linux-x64/native/libgit2-106a5f2.so", + "runtimes/osx/native/libgit2-106a5f2.dylib", + "runtimes/rhel-x64/native/libgit2-106a5f2.so", + "runtimes/ubuntu.16.04-arm64/native/libgit2-106a5f2.so", + "runtimes/ubuntu.18.04-x64/native/libgit2-106a5f2.so", + "runtimes/win-x64/native/git2-106a5f2.dll", + "runtimes/win-x64/native/git2-106a5f2.pdb", + "runtimes/win-x86/native/git2-106a5f2.dll", + "runtimes/win-x86/native/git2-106a5f2.pdb" + ] + }, + "Microsoft.NETCore.Platforms/1.1.0": { + "sha512": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", + "type": "package", + "path": "microsoft.netcore.platforms/1.1.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "ThirdPartyNotices.txt", + "dotnet_library_license.txt", + "lib/netstandard1.0/_._", + "microsoft.netcore.platforms.1.1.0.nupkg.sha512", + "microsoft.netcore.platforms.nuspec", + "runtime.json" + ] + }, + "NETStandard.Library/2.0.3": { + "sha512": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "type": "package", + "path": "netstandard.library/2.0.3", + "files": [ + ".nupkg.metadata", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "build/netstandard2.0/NETStandard.Library.targets", + "build/netstandard2.0/ref/Microsoft.Win32.Primitives.dll", + "build/netstandard2.0/ref/System.AppContext.dll", + "build/netstandard2.0/ref/System.Collections.Concurrent.dll", + "build/netstandard2.0/ref/System.Collections.NonGeneric.dll", + "build/netstandard2.0/ref/System.Collections.Specialized.dll", + "build/netstandard2.0/ref/System.Collections.dll", + "build/netstandard2.0/ref/System.ComponentModel.Composition.dll", + "build/netstandard2.0/ref/System.ComponentModel.EventBasedAsync.dll", + "build/netstandard2.0/ref/System.ComponentModel.Primitives.dll", + "build/netstandard2.0/ref/System.ComponentModel.TypeConverter.dll", + "build/netstandard2.0/ref/System.ComponentModel.dll", + "build/netstandard2.0/ref/System.Console.dll", + "build/netstandard2.0/ref/System.Core.dll", + "build/netstandard2.0/ref/System.Data.Common.dll", + "build/netstandard2.0/ref/System.Data.dll", + "build/netstandard2.0/ref/System.Diagnostics.Contracts.dll", + "build/netstandard2.0/ref/System.Diagnostics.Debug.dll", + "build/netstandard2.0/ref/System.Diagnostics.FileVersionInfo.dll", + "build/netstandard2.0/ref/System.Diagnostics.Process.dll", + "build/netstandard2.0/ref/System.Diagnostics.StackTrace.dll", + "build/netstandard2.0/ref/System.Diagnostics.TextWriterTraceListener.dll", + "build/netstandard2.0/ref/System.Diagnostics.Tools.dll", + "build/netstandard2.0/ref/System.Diagnostics.TraceSource.dll", + "build/netstandard2.0/ref/System.Diagnostics.Tracing.dll", + "build/netstandard2.0/ref/System.Drawing.Primitives.dll", + "build/netstandard2.0/ref/System.Drawing.dll", + "build/netstandard2.0/ref/System.Dynamic.Runtime.dll", + "build/netstandard2.0/ref/System.Globalization.Calendars.dll", + "build/netstandard2.0/ref/System.Globalization.Extensions.dll", + "build/netstandard2.0/ref/System.Globalization.dll", + "build/netstandard2.0/ref/System.IO.Compression.FileSystem.dll", + "build/netstandard2.0/ref/System.IO.Compression.ZipFile.dll", + "build/netstandard2.0/ref/System.IO.Compression.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.DriveInfo.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.Primitives.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.Watcher.dll", + "build/netstandard2.0/ref/System.IO.FileSystem.dll", + "build/netstandard2.0/ref/System.IO.IsolatedStorage.dll", + "build/netstandard2.0/ref/System.IO.MemoryMappedFiles.dll", + "build/netstandard2.0/ref/System.IO.Pipes.dll", + "build/netstandard2.0/ref/System.IO.UnmanagedMemoryStream.dll", + "build/netstandard2.0/ref/System.IO.dll", + "build/netstandard2.0/ref/System.Linq.Expressions.dll", + "build/netstandard2.0/ref/System.Linq.Parallel.dll", + "build/netstandard2.0/ref/System.Linq.Queryable.dll", + "build/netstandard2.0/ref/System.Linq.dll", + "build/netstandard2.0/ref/System.Net.Http.dll", + "build/netstandard2.0/ref/System.Net.NameResolution.dll", + "build/netstandard2.0/ref/System.Net.NetworkInformation.dll", + "build/netstandard2.0/ref/System.Net.Ping.dll", + "build/netstandard2.0/ref/System.Net.Primitives.dll", + "build/netstandard2.0/ref/System.Net.Requests.dll", + "build/netstandard2.0/ref/System.Net.Security.dll", + "build/netstandard2.0/ref/System.Net.Sockets.dll", + "build/netstandard2.0/ref/System.Net.WebHeaderCollection.dll", + "build/netstandard2.0/ref/System.Net.WebSockets.Client.dll", + "build/netstandard2.0/ref/System.Net.WebSockets.dll", + "build/netstandard2.0/ref/System.Net.dll", + "build/netstandard2.0/ref/System.Numerics.dll", + "build/netstandard2.0/ref/System.ObjectModel.dll", + "build/netstandard2.0/ref/System.Reflection.Extensions.dll", + "build/netstandard2.0/ref/System.Reflection.Primitives.dll", + "build/netstandard2.0/ref/System.Reflection.dll", + "build/netstandard2.0/ref/System.Resources.Reader.dll", + "build/netstandard2.0/ref/System.Resources.ResourceManager.dll", + "build/netstandard2.0/ref/System.Resources.Writer.dll", + "build/netstandard2.0/ref/System.Runtime.CompilerServices.VisualC.dll", + "build/netstandard2.0/ref/System.Runtime.Extensions.dll", + "build/netstandard2.0/ref/System.Runtime.Handles.dll", + "build/netstandard2.0/ref/System.Runtime.InteropServices.RuntimeInformation.dll", + "build/netstandard2.0/ref/System.Runtime.InteropServices.dll", + "build/netstandard2.0/ref/System.Runtime.Numerics.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Formatters.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Json.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Primitives.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.Xml.dll", + "build/netstandard2.0/ref/System.Runtime.Serialization.dll", + "build/netstandard2.0/ref/System.Runtime.dll", + "build/netstandard2.0/ref/System.Security.Claims.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Algorithms.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Csp.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Encoding.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.Primitives.dll", + "build/netstandard2.0/ref/System.Security.Cryptography.X509Certificates.dll", + "build/netstandard2.0/ref/System.Security.Principal.dll", + "build/netstandard2.0/ref/System.Security.SecureString.dll", + "build/netstandard2.0/ref/System.ServiceModel.Web.dll", + "build/netstandard2.0/ref/System.Text.Encoding.Extensions.dll", + "build/netstandard2.0/ref/System.Text.Encoding.dll", + "build/netstandard2.0/ref/System.Text.RegularExpressions.dll", + "build/netstandard2.0/ref/System.Threading.Overlapped.dll", + "build/netstandard2.0/ref/System.Threading.Tasks.Parallel.dll", + "build/netstandard2.0/ref/System.Threading.Tasks.dll", + "build/netstandard2.0/ref/System.Threading.Thread.dll", + "build/netstandard2.0/ref/System.Threading.ThreadPool.dll", + "build/netstandard2.0/ref/System.Threading.Timer.dll", + "build/netstandard2.0/ref/System.Threading.dll", + "build/netstandard2.0/ref/System.Transactions.dll", + "build/netstandard2.0/ref/System.ValueTuple.dll", + "build/netstandard2.0/ref/System.Web.dll", + "build/netstandard2.0/ref/System.Windows.dll", + "build/netstandard2.0/ref/System.Xml.Linq.dll", + "build/netstandard2.0/ref/System.Xml.ReaderWriter.dll", + "build/netstandard2.0/ref/System.Xml.Serialization.dll", + "build/netstandard2.0/ref/System.Xml.XDocument.dll", + "build/netstandard2.0/ref/System.Xml.XPath.XDocument.dll", + "build/netstandard2.0/ref/System.Xml.XPath.dll", + "build/netstandard2.0/ref/System.Xml.XmlDocument.dll", + "build/netstandard2.0/ref/System.Xml.XmlSerializer.dll", + "build/netstandard2.0/ref/System.Xml.dll", + "build/netstandard2.0/ref/System.dll", + "build/netstandard2.0/ref/mscorlib.dll", + "build/netstandard2.0/ref/netstandard.dll", + "build/netstandard2.0/ref/netstandard.xml", + "lib/netstandard1.0/_._", + "netstandard.library.2.0.3.nupkg.sha512", + "netstandard.library.nuspec" + ] + } + }, + "projectFileDependencyGroups": { + ".NETStandard,Version=v2.0": [ + "LibGit2Sharp >= 0.26.2", + "LibGit2Sharp.NativeBinaries >= 2.0.306", + "NETStandard.Library >= 2.0.3" + ] + }, + "packageFolders": { + "C:\\Users\\Renderheads 1\\.nuget\\packages\\": {}, + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {} + }, + "project": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "C:\\Projects\\MOSTI\\UnityGitRepositoryManager\\Plugin\\GitRepositoryManager.csproj", + "projectName": "GitRepositoryManager", + "projectPath": "C:\\Projects\\MOSTI\\UnityGitRepositoryManager\\Plugin\\GitRepositoryManager.csproj", + "packagesPath": "C:\\Users\\Renderheads 1\\.nuget\\packages\\", + "outputPath": "C:\\Projects\\MOSTI\\UnityGitRepositoryManager\\Plugin\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" + ], + "configFilePaths": [ + "C:\\Users\\Renderheads 1\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "netstandard2.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "netstandard2.0": { + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + } + }, + "frameworks": { + "netstandard2.0": { + "dependencies": { + "LibGit2Sharp": { + "target": "Package", + "version": "[0.26.2, )" + }, + "LibGit2Sharp.NativeBinaries": { + "target": "Package", + "version": "[2.0.306, )" + }, + "NETStandard.Library": { + "suppressParent": "All", + "target": "Package", + "version": "[2.0.3, )", + "autoReferenced": true + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48" + ], + "assetTargetFallback": true, + "warn": true, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.100\\RuntimeIdentifierGraph.json" + } + } + } +} \ No newline at end of file diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index 79a0b32..07ebfb0 100644 Binary files a/ProjectSettings/AudioManager.asset and b/ProjectSettings/AudioManager.asset differ diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset index eb051dc..e7886b2 100644 Binary files a/ProjectSettings/ClusterInputManager.asset and b/ProjectSettings/ClusterInputManager.asset differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 89bc7a8..0147887 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 451e6ed..2569d13 100644 Binary files a/ProjectSettings/EditorSettings.asset and b/ProjectSettings/EditorSettings.asset differ diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index ec44579..74d7b53 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index d439ece..17c8f53 100644 Binary files a/ProjectSettings/InputManager.asset and b/ProjectSettings/InputManager.asset differ diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset index 2b8697a..3b0b7c3 100644 Binary files a/ProjectSettings/NavMeshAreas.asset and b/ProjectSettings/NavMeshAreas.asset differ diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset index 889a541..636a595 100644 Binary files a/ProjectSettings/PresetManager.asset and b/ProjectSettings/PresetManager.asset differ diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 6b55ba5..1c92a78 100644 Binary files a/ProjectSettings/TagManager.asset and b/ProjectSettings/TagManager.asset differ diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index 15db44d..558a017 100644 Binary files a/ProjectSettings/TimeManager.asset and b/ProjectSettings/TimeManager.asset differ diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index f8ea25b..fa0b146 100644 Binary files a/ProjectSettings/UnityConnectSettings.asset and b/ProjectSettings/UnityConnectSettings.asset differ diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset index df893d2..6e0eaca 100644 Binary files a/ProjectSettings/VFXManager.asset and b/ProjectSettings/VFXManager.asset differ