Skip to content

Small fixes related to editor only scripts and non MRTK projects #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreiborodin merged 7 commits into from
Jan 7, 2020
Merged

Small fixes related to editor only scripts and non MRTK projects #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
62555c1
unblock mixed reality toolkit dependencies related to asset retargetting
Dec 19, 2019
fa45f7d
make items more generic and fix player excluded editor files
Dec 20, 2019
c0a80d5
add back code
Dec 20, 2019
7b9b7d1
fix dll include
Dec 20, 2019
9f4e9f9
fix some review comments
Jan 2, 2020
6d16144
merge master
Jan 2, 2020
09ad0bd
Update UnityProjectInfo.cs
chrisfromwork Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions ...crosoft.msbuildforunity/Editor/ProjectGenerator/Scripts/AssetScriptReferenceRetargeter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,8 @@ private static Dictionary<string, AssemblyInformation> ProcessCompiledDLLs(strin

foreach (Assembly dll in dlls)
{
if (dll.name.Contains("MixedReality"))
// TODO - this should be improved/it won't work for non microsoft dlls
if (dll.name.Contains("Microsoft.MixedReality"))
{
string dllPath = Utilities.GetFullPathFromAssetsRelative($"Assets/../MSBuild/Publish/InEditor/WindowsStandalone32/{dll.name}.dll");
File.Copy(dllPath, Path.Combine(tmpDirPath, $"{dll.name}.dll"), true);
Expand Down Expand Up @@ -374,10 +375,6 @@ private static Dictionary<string, AssemblyInformation> ProcessCompiledDLLs(strin
{
Debug.LogError($"Encountered a MonoScript we get a null Type from: '{monoScript.name}'");
}
else if (type.Namespace == null || !type.Namespace.Contains("Microsoft.MixedReality.Toolkit"))
{
throw new InvalidDataException($"Type {type.Name} is not a member of the Microsoft.MixedReality.Toolkit namespace");
}
else
{
assemblyInformation.CompiledClasses.Add(type.FullName, new ClassInformation() { Name = type.Name, Namespace = type.Namespace, FileId = fileId, Guid = newDllGuid });
Expand Down Expand Up @@ -423,8 +420,8 @@ private static void CopyPluginContents(string outputPath)
}
Directory.CreateDirectory(pluginPath);

CopyFiles(directory, pluginPath, "Microsoft.MixedReality.Toolkit*.dll");
CopyFiles(directory, pluginPath, "Microsoft.MixedReality.Toolkit*.pdb");
CopyFiles(directory, pluginPath, "Microsoft.MixedReality*.dll");
CopyFiles(directory, pluginPath, "Microsoft.MixedReality*.pdb");
}
}

Expand Down
8 changes: 7 additions & 1 deletion ...ty/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/MSBuildTools.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ public static void GenerateSDKProjects()
}
}

public static void RegenerateSDKProjects()
{
RegenerateEverything(reparseUnityData:true);
Debug.Log($"{nameof(RegenerateSDKProjects)} Completed Succesfully.");
}

[MenuItem("MSBuild/Documentation...", priority = 203)]
public static void LaunchHelp()
{
Expand Down Expand Up @@ -180,7 +186,7 @@ private static void RefreshGeneratedOutput(bool forceGenerateEverything)
bool shouldClean = EditorPrefs.GetInt($"{nameof(MSBuildTools)}.{nameof(currentBuildTarget)}") != (int)currentBuildTarget
|| EditorPrefs.GetInt($"{nameof(MSBuildTools)}.{nameof(targetFramework)}") != (int)targetFramework
|| forceGenerateEverything;

if (shouldClean)
{
// We clean up previous build if the EditorPrefs currentBuildTarget or targetFramework is different from current ones.
Expand Down
4 changes: 2 additions & 2 deletions ...ackages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/UnityProjectInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ private CSProjectInfo GetProjectInfo(Dictionary<string, CSProjectInfo> projectsM

if (!assemblyDefinitionInfo.BuiltInPackage)
{
Uri dependencies = new Uri(Path.Combine(Utilities.AssetPath, "Dependencies"));
Uri dependencies = new Uri(Path.Combine(Utilities.AssetPath, "Dependencies\\"));
foreach (PluginAssemblyInfo plugin in Plugins.Where(t => t.Type != PluginType.Native))
{
if (!dependencies.IsBaseOf(plugin.ReferencePath) && (plugin.AutoReferenced || assemblyDefinitionInfo.PrecompiledAssemblyReferences.Contains(plugin.Name)))
Expand Down Expand Up @@ -343,4 +343,4 @@ private List<PluginAssemblyInfo> ScanForPluginDLLs()
}
}
}
#endif
#endif