Add sample for External dependencies and update Project Generator #35

andreiborodin · 2019-10-24T23:35:05Z

This change is currently a preview of the current state of the feature, so far this includes:

The ProjectGenerator creates props/targets file separate from the C# project file for each AsmDef
-- The C# file can be checked in and won't be overwritten
Added a sample directory where as I implement this work I lay out the external dependencies sample

…to signify two components

keveleigh

Nothing jumps out at me!
I like the rework of the export code into IProjectExporter

* Misc cleanup, also refactor a bit more csprojectinfo and exporter relationship * Rewrote the template process for XML, haven't replaced existing process yet. * Various perf improvements, also removed need to create PackageCopy * Implemented TextFileTemplate * A few more minor changes * A bit of cleanup * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/IProjectExporter.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/Xml/XmlCommentTemplateToken.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/TemplateReplacementSet.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/ITemplatePart.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/TemplatedProjectExporter.cs Co-Authored-By: Kurtis <[email protected]> * Removing commented code

* Misc cleanup, also refactor a bit more csprojectinfo and exporter relationship * Rewrote the template process for XML, haven't replaced existing process yet. * Various perf improvements, also removed need to create PackageCopy * Implemented TextFileTemplate * A few more minor changes * A bit of cleanup * Added support for including on soure file locations and excluding on source file locations * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/IProjectExporter.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/Xml/XmlCommentTemplateToken.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/TemplateReplacementSet.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/ITemplatePart.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/TemplatedProjectExporter.cs Co-Authored-By: Kurtis <[email protected]> * Removing commented code

* Misc cleanup, also refactor a bit more csprojectinfo and exporter relationship * Rewrote the template process for XML, haven't replaced existing process yet. * Various perf improvements, also removed need to create PackageCopy * Implemented TextFileTemplate * A few more minor changes * A bit of cleanup * Added support for including on soure file locations and excluding on source file locations * First iteration of updating project structure * Updated the structure, and ensured standard scenarios still work * Added an example of external nuget package reference * Added the NuGet dependency example that has minimum requirement of MSBuildForUnity * Adding settings json file * Fixed an error * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/TemplateReplacementSet.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/Xml/XmlCommentTemplateToken.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/ITemplatePart.cs Co-Authored-By: Kurtis <[email protected]> * Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/IProjectExporter.cs Co-Authored-By: Kurtis <[email protected]> * Updating templates with comments * Minor updates

* Udpating the sample to be a simple nuget dependency * Added Readme for the simple nuget package sample

…pendencies

* Updating project generator to support Dependencies project * Checking in initial version of the sample * Exclude dependencies folder from participating in contributing plugins to the csproject files generated * Added the generated projects that can be checked-in * Made use of JSOn * Trying to get external reference to be included * Fixed up most of the things needed to make supported integrated dependencies * More fixes * Completed the Readme.md * Fixing switching platforms * Updated documentaiton * Updating project generator to support Dependencies project * Checking in initial version of the sample * Exclude dependencies folder from participating in contributing plugins to the csproject files generated * Added the generated projects that can be checked-in * Made use of JSOn * Sign dlls and package (#39) This change updates the NuGet package build to sign MSBuildForUnity.dll as well as the NuGet package itself. Break the existing build step into two separate steps (build and package) Add a step for signing binaries between building and packaging Add a step for signing the package * Add NuGet package badge and link to readme (#41) * Trying to get external reference to be included * Sign third party components (#47) The primary change here is to sign third party components (Newtonsoft.Json and Mono.Cecil) and include them in the NuGet package: - Update MSBuildForUnity.csproj to ensure third party components are copied to the output directory (so we can sign them), and make sure they are then packaged up with the NuGet package. - Update the code signing steps to sign the third party components. I also made a couple related changes:: - Replace the Mono.Cecil submodule with the actual NuGet package (an updated package was published a few days ago with the bug fixes we needed). - Add the ComponentGovernanceComponentDetection step to check for third party components with any known problems (we shouldn't ship such components). * Move GenerateAssetId into a custom C# task, since CodeTaskFactory is not compatible with dotnet (#48) * Fixed up most of the things needed to make supported integrated dependencies * More fixes * Completed the Readme.md * Fixing switching platforms * Updated documentaiton * Updating project generator to support Dependencies project * Checking in initial version of the sample * Exclude dependencies folder from participating in contributing plugins to the csproject files generated * Added the generated projects that can be checked-in * Made use of JSOn * Trying to get external reference to be included * rebase * Sign third party components (#47) The primary change here is to sign third party components (Newtonsoft.Json and Mono.Cecil) and include them in the NuGet package: - Update MSBuildForUnity.csproj to ensure third party components are copied to the output directory (so we can sign them), and make sure they are then packaged up with the NuGet package. - Update the code signing steps to sign the third party components. I also made a couple related changes:: - Replace the Mono.Cecil submodule with the actual NuGet package (an updated package was published a few days ago with the bug fixes we needed). - Add the ComponentGovernanceComponentDetection step to check for third party components with any known problems (we shouldn't ship such components). * Fixed up most of the things needed to make supported integrated dependencies * More fixes * Completed the Readme.md * Fixing switching platforms * Updated documentaiton * Updating project generator to support Dependencies project * Checking in initial version of the sample * Added the generated projects that can be checked-in * Trying to get external reference to be included * Fixed up most of the things needed to make supported integrated dependencies * More fixes * Completed the Readme.md * Fixing switching platforms * Updated documentaiton * minor fixes * One more change * Responding to Kurtis' comments

andreiborodin · 2019-11-14T21:11:51Z

I think this fixes: #25, and #24

Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj

...buildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template

Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj

Samples/SimpleNuGetDependency.Unity/README.md

Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj

Samples/IntegratedDependencies.Unity/README.md

Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NuGet.config

...nity/Packages/com.microsoft.msbuildforunity/Editor/ProjectBuilder/MSBuildProjectReference.cs

ryantrem · 2019-11-14T23:58:19Z

...nity/Packages/com.microsoft.msbuildforunity/Editor/ProjectBuilder/MSBuildProjectReference.cs

@@ -72,20 +79,20 @@ public string ProjectPath
                }

                // Determine the absolute path of the MSBuild project (based on the projectPath being relative to the MSBuildProjectReference asset).
-                if (!string.IsNullOrEmpty(this.projectPath))
+                if (!string.IsNullOrEmpty(projectPath))


Why did you remove the this. qualifier? Now it is hard to tell at a glance whether this is a member variable or local variable.

This was automatic formatting. I can add this back if you like?

Preferably yes. We don't have consistent styling in the code right now, but I would prefer to qualify in at least the code I contribute to because I find it much easier to quickly reason about.

Definetly, sorry, it's my automatic rules. Will fix this file.

Samples/IntegratedDependencies.Unity/README.md

ryantrem · 2019-11-19T02:19:55Z

Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj

+
+    <Version>$(MajorVersion).$(MinorVersion).$(RevisionVersion)</Version>
+    <!-- Version is based on Major.Minor.Revision as defined above, however, in a lab BUILD_BUILDID will be set so we pull in that as the pre-release version. -->
+    <Version Condition="'$(BUILD_BUILDID)' != ''">$(Version)-$(BUILD_BUILDID)</Version>


If you are switching the NuGet package version to use the pre-release suffix, then you should remove the NuGet package badge from the top level readme.md as ADO does not provide package badges for pre-release builds.

Could I just update it to show latest stable when I go ahead and release 0.8.0?

ryantrem

I left a few more comments, but this looks close, so signing off to make sure you aren't blocked on me.

Andrei Borodin added 3 commits October 24, 2019 13:53

Added a Unity project with reference to MSBuildForUnity and 2 asmdef …

ad450ad

…to signify two components

Added props/targets templates, and also refactored to exporter model

d960fbb

More changes, plus some sample updates

0dec54d

andreiborodin requested a review from ryantrem October 24, 2019 23:35

andreiborodin self-assigned this Oct 24, 2019

keveleigh approved these changes Nov 1, 2019

View reviewed changes

Andrei Borodin added 6 commits November 4, 2019 14:57

Simple NuGet Dependency Sample (#46)

aa9984d

* Udpating the sample to be a simple nuget dependency * Added Readme for the simple nuget package sample

Merge remote-tracking branch 'origin/master' into features/externalDe…

c046f85

…pendencies

Andrei Borodin added 2 commits November 14, 2019 13:26

Updating the main Readme.md (#50)

b06e86f

Updating versioning (#51)

b1b4011

andreiborodin requested a review from keveleigh November 14, 2019 21:46

Andrei Borodin added 2 commits November 14, 2019 13:56

Update README.md

ef00845

Update package.json

bd00781

keveleigh approved these changes Nov 14, 2019

View reviewed changes

Moved where Unity Major/Minor version is specified (#52)

ead83b3

keveleigh mentioned this pull request Nov 14, 2019

Updating the main Readme.md #50

Merged

Added the current MSBuildForUnityVersion

351d9e8

CoPrez reviewed Nov 15, 2019

View reviewed changes

Source/MSBuildTools.Unity.NuGet/MSBuildForUnity.csproj Show resolved Hide resolved

CoPrez reviewed Nov 15, 2019

View reviewed changes

...buildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template Show resolved Hide resolved

ryantrem requested changes Nov 15, 2019

View reviewed changes

Responding to Ryan's changes

cb0fe46

ryantrem reviewed Nov 19, 2019

View reviewed changes

Samples/IntegratedDependencies.Unity/README.md Outdated Show resolved Hide resolved

ryantrem reviewed Nov 19, 2019

View reviewed changes

Samples/IntegratedDependencies.Unity/README.md Outdated Show resolved Hide resolved

ryantrem reviewed Nov 19, 2019

View reviewed changes

Samples/IntegratedDependencies.Unity/README.md Outdated Show resolved Hide resolved

ryantrem reviewed Nov 19, 2019

View reviewed changes

ryantrem approved these changes Nov 19, 2019

View reviewed changes

Andrei Borodin added 4 commits November 18, 2019 20:52

Moved Dependencies project

d141026

Re-enabled default profiles

786671e

Undoing auto-formatting

1e5128e

Flipped backslash to forward slash

70343d8

andreiborodin merged commit bc27ef9 into master Nov 19, 2019

andreiborodin deleted the features/externalDependencies branch November 19, 2019 05:25

andreiborodin mentioned this pull request Nov 19, 2019

Noobie question about MSBuildForUnity #44

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add sample for External dependencies and update Project Generator #35

Add sample for External dependencies and update Project Generator #35

andreiborodin commented Oct 24, 2019

keveleigh left a comment

andreiborodin commented Nov 14, 2019

ryantrem Nov 14, 2019

andreiborodin Nov 16, 2019 •

edited

Loading

ryantrem Nov 19, 2019

andreiborodin Nov 19, 2019

ryantrem Nov 19, 2019

andreiborodin Nov 19, 2019

ryantrem left a comment

Add sample for External dependencies and update Project Generator #35

Add sample for External dependencies and update Project Generator #35

Conversation

andreiborodin commented Oct 24, 2019

keveleigh left a comment

Choose a reason for hiding this comment

andreiborodin commented Nov 14, 2019

ryantrem Nov 14, 2019

Choose a reason for hiding this comment

andreiborodin Nov 16, 2019 • edited Loading

Choose a reason for hiding this comment

ryantrem Nov 19, 2019

Choose a reason for hiding this comment

andreiborodin Nov 19, 2019

Choose a reason for hiding this comment

ryantrem Nov 19, 2019

Choose a reason for hiding this comment

andreiborodin Nov 19, 2019

Choose a reason for hiding this comment

ryantrem left a comment

Choose a reason for hiding this comment

andreiborodin Nov 16, 2019 •

edited

Loading