Граф коммитов

44 Коммитов

Автор SHA1 Сообщение Дата
Kurtis 6b4e8a94ab
Merge pull request #158 from microsoft/dependabot/nuget/Samples/IntegratedDependencies.Unity/Assets/WSASpecific/Newtonsoft.Json-13.0.1
Bump Newtonsoft.Json from 12.0.3 to 13.0.1 in /Samples/IntegratedDependencies.Unity/Assets/WSASpecific
2022-08-29 10:13:28 -07:00
dependabot[bot] 38f55daa0e
Bump Newtonsoft.Json
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 12.0.3 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.3...13.0.1)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-22 22:06:17 +00:00
dependabot[bot] 2af53ad54b
Bump Newtonsoft.Json
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 12.0.2 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.2...13.0.1)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-22 22:06:09 +00:00
Hendry Effendy 2c50207edd
Update samples to be compliant with NuGet security analysis in Azure pipelines
Update samples to be compliant with automatic NuGet security analysis injected in ADO pipelines. See https://aka.ms/nugetsecurityanalysis for more details but this essentially boils down to:

1. Ensuring `<clear/>` statements are in each nuget.config file in the repo
2. nuget.config only specifies a singular nuget feed

Since these are samples, the change adds 1 above and comments out references to the MSBuildForUnity feed with the expectation that one would uncomment them from the sample when testing this out manually. This is currently consistent with the documentation that a special feed for the MSBuildForUnity is currently required.
2021-07-07 13:38:29 -07:00
Andrei Borodin a043d4b1d4 In the dependencies project we can explicitly set the target framework after importing the commons file. This fixes an issue with VS2019 2020-01-30 14:47:32 -08:00
Andrei Borodin 917d8b4823 Responded to comments, and updated regen logic. 2020-01-30 13:52:30 -08:00
Andrei Borodin 48800031c3 Added comments, and made one more minor adjustment. 2020-01-28 15:49:07 -08:00
Andrei Borodin 0e463c82cd Updated cross-unity dependency solution. 2020-01-28 15:04:51 -08:00
Andrei Borodin 9fb353f351 Fixed to matchup previous behaviour. 2020-01-28 14:58:58 -08:00
Andrei Borodin 9c8d0be4df Fixing dependency project in the solution, also disabled output clenaup 2020-01-23 12:25:32 -08:00
Andrei Borodin 40d6d1a542 Fixes and updates for the top-level project changes. 2020-01-22 16:20:49 -08:00
Andrei Borodin 3847ca4b37 Fixing overwriting of Dependencies project. 2020-01-22 15:20:11 -08:00
Andrei Borodin 2e2bb926e5 Commiting ready changes. 2020-01-21 16:54:43 -08:00
Andrei Borodin 814d0018a1 Updated props generation to a better/newer format 2020-01-17 14:57:56 -08:00
Andrei Borodin 9931587fd3 Responding to comments 2020-01-17 13:15:05 -08:00
Andrei Borodin 6fe780e4a0 Added documentaiton. 2020-01-16 15:49:08 -08:00
Andrei Borodin 005a9b7961 Fixing a few issues. 2020-01-16 12:09:24 -08:00
Andrei Borodin 852062243f Seems to work. 2020-01-15 17:36:09 -08:00
Andrei Borodin 9b82eb5769 Created the CorssUnityDependencies Sample project 2020-01-10 15:30:07 -08:00
Andrei Borodin 05290814ea And checking in updated sln file. 2020-01-08 14:30:09 -08:00
Andrei Borodin 0733604f1c Fixed config mapping section regen. 2020-01-08 13:06:10 -08:00
Andrei Borodin 5bebe68087 Fixed extra periods. 2020-01-08 12:05:35 -08:00
Andrei Borodin ead15348a3 Reworked config mapping rules for sln files. This should now be more flexible. 2020-01-08 12:01:47 -08:00
Andrei Borodin ba5d5cbddd Sorted config mappings. 2020-01-07 11:46:09 -08:00
Andrei Borodin 862f05df83 Updating the checked-in solution to contain the external projects. 2020-01-07 11:31:19 -08:00
Andrei Borodin 2193698c76 Completed the work, needs testing. 2019-12-27 17:47:12 -08:00
Andrei Borodin 76a32766ee Corrected ordering of nested items so that saving solution doesn't update it. 2019-12-24 13:51:16 -08:00
Andrei Borodin 73060bd7f4 Another tweak to dependencies proj mapping. 2019-12-24 13:33:46 -08:00
Andrei Borodin 32760616d9 Add dependencies default mapping. 2019-12-24 13:25:46 -08:00
Andrei Borodin dc334b5889 More minor modifications. 2019-12-24 13:12:31 -08:00
Andrei Borodin 5c4f1f79da Ensuring guid stability for some generated items. 2019-12-24 13:05:34 -08:00
Andrei Borodin dd4199e9ff Another change to ensure that when sln is saved, it contents not reorderred. 2019-12-24 12:42:06 -08:00
Andrei Borodin f9537bfe93 Removed empty project sections, corrected project naming 2019-12-23 16:25:26 -08:00
Andrei Borodin a9c62cbdfa Fix relative path. 2019-12-23 16:16:29 -08:00
Andrei Borodin 7278ce7424 Initial check-in 2019-12-23 16:11:42 -08:00
Andrei Borodin fb3f87d1a1 Updated External projects to pull .NET reference assemblies 2019-12-18 17:06:46 -08:00
Andrei Borodin 857f697a32
Correcting Sample README
The readme had incorrect contents listed of Assets/WSASpecific/Component.WSA.msb4u.csproj, corrected it.
2019-12-12 10:22:07 -08:00
Andrei Borodin a4bfe8e121 Doing some version synchronization across the MSBuild projects as well as auto-incrementing the version for non-release branches 2019-12-10 09:44:44 -08:00
Andrei Borodin f4c42f9ea9
Updating version to 0.8.3 (#78) 2019-12-09 14:03:32 -08:00
Andrei Borodin d1e3a15530
Fix Platform and TargetFramework switching (#70)
* Rework automatic generation logic, and ensure cleanning of build artifacts is done at appropriate times.

* Removing debug logs.

* A few minor fixes to strengthen regen for correct times.

* Updated versions to 0.8.2

* Forcing NuGet packages to be copied out to bin folder
2019-11-27 11:22:40 -08:00
Andrei Borodin bf60529cbd
Final Prep for Release (#66)
* Attempting to not produce a prerelease versioned NuGet package.

* Fixing typo

* Trying to use current branch

* Trying to use current branch

* Fixing typo

* Fixed source branch parameter

* Update UPM to only increment if not a release branch

* Preparing for release of 0.8.1
2019-11-21 16:36:39 -08:00
Andrei Borodin 1810244cfb
Expose Project Assets Path in Common Props (#64)
* Exposed Project path through commons file, and updated SimpleNuGetDependency project to make use of it

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/MSBuildTemplates/MSBuildForUnity.Common.props.template

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Fixed typo

* Renamed property
2019-11-21 13:03:57 -08:00
Andrei Borodin d601f0341d
Updating Readme, plus version range (#60)
* Updating MSBuildForUnity NuGet package reference that is either generated or embedded int he simple sample. The new version range allows any 0.8.0- prerelease, or a 0.8.0 package as max.

* Git is case sensitive on link, fixing it
2019-11-20 13:38:34 -08:00
Andrei Borodin bc27ef9594
Add sample for External dependencies and update Project Generator (#35)
* Added a Unity project with reference to MSBuildForUnity and 2 asmdef to signify two components

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

* More changes, plus some sample updates

* Perf Improvements in preparation of External Depedencies (#42)

* 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 <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/Xml/XmlCommentTemplateToken.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/TemplateReplacementSet.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/ITemplatePart.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/TemplatedProjectExporter.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Removing commented code

* Replace Source File references with Folder Includes (#43)

* 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 <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/Xml/XmlCommentTemplateToken.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/TemplateReplacementSet.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/ITemplatePart.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/TemplatedProjectExporter.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Removing commented code

* Update Generated Project Structure (#45)

* 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 <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/Xml/XmlCommentTemplateToken.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Templates/ITemplatePart.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Update Source/MSBuildTools.Unity/Packages/com.microsoft.msbuildforunity/Editor/ProjectGenerator/Scripts/Exporters/IProjectExporter.cs

Co-Authored-By: Kurtis <kurtie@microsoft.com>

* Updating templates with comments

* Minor updates

* Simple NuGet Dependency Sample (#46)

* Udpating the sample to be a simple nuget dependency

* Added Readme for the simple nuget package sample

* Integrated Dependencies (#49)

* 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

* Updating the main Readme.md (#50)

* Updating versioning (#51)

* Update README.md

* Update package.json

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

* Added the current MSBuildForUnityVersion

* Responding to Ryan's changes

* Moved Dependencies project

* Re-enabled default profiles

* Undoing auto-formatting

* Flipped backslash to forward slash
2019-11-18 21:25:29 -08:00