Skip to content

Top-Level Project Generation Change #111

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 8 commits into from
Jan 23, 2020
Merged

Top-Level Project Generation Change #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e2bb92
Commiting ready changes.
Jan 22, 2020
6a675c7
Fixed typo.
Jan 22, 2020
4ef4edb
Responding to Chris' comments.
Jan 22, 2020
d2768ba
Merge remote-tracking branch 'origin/master' into features/updateDepe…
Jan 22, 2020
3f866b6
Defaulting package/project references to include contentFiles;build t…
Jan 22, 2020
1a8dc82
updated how private assets is set
Jan 22, 2020
3847ca4
Fixing overwriting of Dependencies project.
Jan 22, 2020
40d6d1a
Fixes and updates for the top-level project changes.
Jan 23, 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
3 changes: 2 additions & 1 deletion Samples/CrossUnityDependencies.Unity/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ crashlytics-build.properties
/MSBuildForUnity.Common.props
!/Assets/**/*.msb4u.*
!/Packages/**/*.msb4u.*
/Assets/Dependencies
/Assets/Dependencies
/Assets/Dependencies.meta
2 changes: 1 addition & 1 deletion Samples/CrossUnityDependencies.Unity/Assets/Assembly-CSharp.msb4u.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<ItemGroup>
<!-- Add your references here -->
<!-- This reference to a separate Unity project should also be placed in Dependencies.msb4u.csproj. -->
<!-- This reference to a separate Unity project should also be placed in {ProjectName}.Dependencies.msb4u.csproj. -->
<ProjectReference Include="..\..\IntegratedDependencies.Unity\Assets\GeneralComponent\GeneralComponent.msb4u.csproj"/>
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions ...es.Unity/Assets/Dependencies.msb4u.csproj → ...endencies.Unity.Dependencies.msb4u.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="15.0">
<Project ToolsVersion="15.0">
<!--GENERATED FILE-->
<!--
This file can be modified and checked in.
Expand All @@ -10,7 +10,7 @@
and before:
- <Import Project="$(MSBuildForUnityGeneratedProjectDirectory)\$(MSBuildProjectName).g.targets" />

Do not add any source or compliation items.
Do not add any source or compilation items.

Examples of how you can modify this file:
- Add NuGet package references:
Expand All @@ -34,8 +34,8 @@
<Import Project="$(MSBuildForUnityGeneratedProjectDirectory)\$(MSBuildProjectName).g.props" />

<ItemGroup>
<!-- Add your references here -->
<ProjectReference Include="..\..\IntegratedDependencies.Unity\Assets\GeneralComponent\GeneralComponent.msb4u.csproj" />
<!--Add NuGet or Project references here-->
<ProjectReference Include="..\..\IntegratedDependencies.Unity\Assets\GeneralComponent\GeneralComponent.msb4u.csproj"/>
</ItemGroup>

<!-- SDK.targets is imported inside this props file -->
Expand Down
12 changes: 12 additions & 0 deletions ...nityDependencies.Unity/Assets/CrossUnityDependencies.Unity.Dependencies.msb4u.csproj.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 24 additions & 24 deletions Samples/CrossUnityDependencies.Unity/Assets/CrossUnityDependencies.Unity.msb4u.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@ Global
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.InEditor|WindowsStandalone64.Build.0 = InEditor|WindowsStandalone64
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.InEditor|WSA.ActiveCfg = InEditor|WSA
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.InEditor|WSA.Build.0 = InEditor|WSA
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|Android.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|Any CPU.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|iOS.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WindowsStandalone32.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WindowsStandalone64.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WSA.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|Android.ActiveCfg = Player|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|Any CPU.ActiveCfg = Player|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|iOS.ActiveCfg = Player|iOS
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WindowsStandalone32.ActiveCfg = Player|WindowsStandalone32
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WindowsStandalone64.ActiveCfg = Player|WindowsStandalone64
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WSA.ActiveCfg = Player|WSA
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Release|Android.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Release|Any CPU.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Release|iOS.ActiveCfg = InEditor|Android
Expand All @@ -147,12 +147,12 @@ Global
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.InEditor|WindowsStandalone64.Build.0 = InEditor|WindowsStandalone64
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.InEditor|WSA.ActiveCfg = InEditor|WSA
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.InEditor|WSA.Build.0 = InEditor|WSA
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|Android.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|Any CPU.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|iOS.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WindowsStandalone32.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WindowsStandalone64.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WSA.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|Android.ActiveCfg = Player|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|Any CPU.ActiveCfg = Player|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|iOS.ActiveCfg = Player|iOS
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WindowsStandalone32.ActiveCfg = Player|WindowsStandalone32
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WindowsStandalone64.ActiveCfg = Player|WindowsStandalone64
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WSA.ActiveCfg = Player|WSA
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Release|Android.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Release|Any CPU.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Release|iOS.ActiveCfg = InEditor|Android
Expand All @@ -176,12 +176,12 @@ Global
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.InEditor|WindowsStandalone64.Build.0 = InEditor|WindowsStandalone64
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.InEditor|WSA.ActiveCfg = InEditor|WSA
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.InEditor|WSA.Build.0 = InEditor|WSA
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|Android.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|Any CPU.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|iOS.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WindowsStandalone32.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WindowsStandalone64.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WSA.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|Android.ActiveCfg = Player|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|Any CPU.ActiveCfg = Player|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|iOS.ActiveCfg = Player|iOS
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WindowsStandalone32.ActiveCfg = Player|WindowsStandalone32
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WindowsStandalone64.ActiveCfg = Player|WindowsStandalone64
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WSA.ActiveCfg = Player|WSA
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Release|Android.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Release|Any CPU.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Release|iOS.ActiveCfg = InEditor|Android
Expand Down Expand Up @@ -239,12 +239,12 @@ Global
{6546D776-5B41-65B4-0850-B3667F981C26}.InEditor|WindowsStandalone64.Build.0 = InEditor|WindowsStandalone64
{6546D776-5B41-65B4-0850-B3667F981C26}.InEditor|WSA.ActiveCfg = InEditor|WSA
{6546D776-5B41-65B4-0850-B3667F981C26}.InEditor|WSA.Build.0 = InEditor|WSA
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|Android.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|Any CPU.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|iOS.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WindowsStandalone32.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WindowsStandalone64.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WSA.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|Android.ActiveCfg = Player|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|Any CPU.ActiveCfg = Player|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|iOS.ActiveCfg = Player|iOS
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WindowsStandalone32.ActiveCfg = Player|WindowsStandalone32
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WindowsStandalone64.ActiveCfg = Player|WindowsStandalone64
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WSA.ActiveCfg = Player|WSA
{6546D776-5B41-65B4-0850-B3667F981C26}.Release|Android.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Release|Any CPU.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Release|iOS.ActiveCfg = InEditor|Android
Expand Down
3 changes: 2 additions & 1 deletion Samples/IntegratedDependencies.Unity/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ crashlytics-build.properties
/MSBuildForUnity.Common.props
!/Assets/**/*.msb4u.*
!/Packages/**/*.msb4u.*
/Assets/Dependencies
/Assets/Dependencies
/Assets/Dependencies.meta
8 changes: 4 additions & 4 deletions ...es.Unity/Assets/Dependencies.msb4u.csproj → ...s/Project.Unity.Dependencies.msb4u.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
It is different from the other generated C# Projects in that it will be the one gathering all dependencies and placing them into the Unity asset folder.

You can add project level dependencies to this file, by placing them below:
- <Import Project="$(MSBuildForUnityGeneratedOutputDirectory)\$(MSBuildProjectName).g.props" />
- <Import Project="$(MSBuildForUnityGeneratedProjectDirectory)\$(MSBuildProjectName).g.props" />
and before:
- <Import Project="$(MSBuildForUnityGeneratedOutputDirectory)\$(MSBuildProjectName).g.targets" />
- <Import Project="$(MSBuildForUnityGeneratedProjectDirectory)\$(MSBuildProjectName).g.targets" />

Do not add any source or compliation items.
Do not add any source or compilation items.

Examples of how you can modify this file:
- Add NuGet package references:
Expand All @@ -36,7 +36,7 @@
<ItemGroup>
<!--Add NuGet or Project references here-->
</ItemGroup>

<!-- SDK.targets is imported inside this props file -->
<Import Project="$(MSBuildForUnityGeneratedProjectDirectory)\$(MSBuildProjectName).g.targets" />
</Project>
4 changes: 2 additions & 2 deletions ...ity/Assets/Dependencies.msb4u.csproj.meta → ...ject.Unity.Dependencies.msb4u.csproj.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 24 additions & 24 deletions Samples/IntegratedDependencies.Unity/Assets/Project.Unity.msb4u.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,12 @@ Global
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.InEditor|WindowsStandalone64.Build.0 = InEditor|WindowsStandalone64
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.InEditor|WSA.ActiveCfg = InEditor|WSA
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.InEditor|WSA.Build.0 = InEditor|WSA
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|Android.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|Any CPU.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|iOS.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WindowsStandalone32.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WindowsStandalone64.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WSA.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|Android.ActiveCfg = Player|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|Any CPU.ActiveCfg = Player|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|iOS.ActiveCfg = Player|iOS
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WindowsStandalone32.ActiveCfg = Player|WindowsStandalone32
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WindowsStandalone64.ActiveCfg = Player|WindowsStandalone64
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Player|WSA.ActiveCfg = Player|WSA
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Release|Android.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Release|Any CPU.ActiveCfg = InEditor|Android
{15A615C7-33AA-2409-09FE-0B28B0D5143C}.Release|iOS.ActiveCfg = InEditor|Android
Expand All @@ -184,12 +184,12 @@ Global
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.InEditor|WindowsStandalone64.Build.0 = InEditor|WindowsStandalone64
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.InEditor|WSA.ActiveCfg = InEditor|WSA
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.InEditor|WSA.Build.0 = InEditor|WSA
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|Android.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|Any CPU.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|iOS.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WindowsStandalone32.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WindowsStandalone64.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WSA.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|Android.ActiveCfg = Player|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|Any CPU.ActiveCfg = Player|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|iOS.ActiveCfg = Player|iOS
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WindowsStandalone32.ActiveCfg = Player|WindowsStandalone32
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WindowsStandalone64.ActiveCfg = Player|WindowsStandalone64
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Player|WSA.ActiveCfg = Player|WSA
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Release|Android.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Release|Any CPU.ActiveCfg = InEditor|Android
{645165C8-1694-74BF-BBEB-8FB0BCFD26F5}.Release|iOS.ActiveCfg = InEditor|Android
Expand All @@ -213,12 +213,12 @@ Global
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.InEditor|WindowsStandalone64.Build.0 = InEditor|WindowsStandalone64
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.InEditor|WSA.ActiveCfg = InEditor|WSA
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.InEditor|WSA.Build.0 = InEditor|WSA
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|Android.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|Any CPU.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|iOS.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WindowsStandalone32.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WindowsStandalone64.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WSA.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|Android.ActiveCfg = Player|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|Any CPU.ActiveCfg = Player|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|iOS.ActiveCfg = Player|iOS
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WindowsStandalone32.ActiveCfg = Player|WindowsStandalone32
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WindowsStandalone64.ActiveCfg = Player|WindowsStandalone64
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Player|WSA.ActiveCfg = Player|WSA
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Release|Android.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Release|Any CPU.ActiveCfg = InEditor|Android
{0DF1F49A-50F1-5354-5BF9-9E3DBB6674AD}.Release|iOS.ActiveCfg = InEditor|Android
Expand Down Expand Up @@ -276,12 +276,12 @@ Global
{6546D776-5B41-65B4-0850-B3667F981C26}.InEditor|WindowsStandalone64.Build.0 = InEditor|WindowsStandalone64
{6546D776-5B41-65B4-0850-B3667F981C26}.InEditor|WSA.ActiveCfg = InEditor|WSA
{6546D776-5B41-65B4-0850-B3667F981C26}.InEditor|WSA.Build.0 = InEditor|WSA
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|Android.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|Any CPU.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|iOS.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WindowsStandalone32.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WindowsStandalone64.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WSA.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|Android.ActiveCfg = Player|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|Any CPU.ActiveCfg = Player|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|iOS.ActiveCfg = Player|iOS
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WindowsStandalone32.ActiveCfg = Player|WindowsStandalone32
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WindowsStandalone64.ActiveCfg = Player|WindowsStandalone64
{6546D776-5B41-65B4-0850-B3667F981C26}.Player|WSA.ActiveCfg = Player|WSA
{6546D776-5B41-65B4-0850-B3667F981C26}.Release|Android.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Release|Any CPU.ActiveCfg = InEditor|Android
{6546D776-5B41-65B4-0850-B3667F981C26}.Release|iOS.ActiveCfg = InEditor|Android
Expand Down
2 changes: 2 additions & 0 deletions Samples/SimpleNuGetDependency.Unity/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,7 @@ crashlytics-build.properties
/MSBuild/Publish/**/*.dll
/MSBuild/Publish/**/*.pdb
/MSBuildForUnity.Common.props
!/Assets/**/*.msb4u.*
!/Packages/**/*.msb4u.*
/Assets/Dependencies
/Assets/Dependencies.meta
1 change: 1 addition & 0 deletions Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Plugins/
.obj/
.bin/
Plugins.meta
!*.csproj
22 changes: 9 additions & 13 deletions Samples/SimpleNuGetDependency.Unity/Assets/NewtonsoftDependency/NewtonsoftDependency.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,21 @@
</PropertyGroup>

<PropertyGroup>
<!-- Make sure Unity ignores the contents of the intermediate output path. -->
<BaseIntermediateOutputPath>.obj</BaseIntermediateOutputPath>
<OutputPath>Plugins</OutputPath>
<OutputPath Condition="'$(MSBuildForUnityDefaultOutputPath)' != ''">$(MSBuildForUnityDefaultOutputPath)</OutputPath>
<!-- Make sure Unity ignores the contents of the output path. -->
<BaseIntermediateOutputPath>.obj\</BaseIntermediateOutputPath>
<OutputPath>.bin\</OutputPath>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MSBuildForUnity" Version="$(MSB4U_DependencyVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<!-- Note that this is the special "NoTarget" SDK to prevent this project from producing a dll. -->
<Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" Version="1.0.80" />
<Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" Version="1.0.85" />

<ItemGroup>
<!-- Standard NuGet package -->
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />

<!-- A MSBuildForUnity enabled NuGet package that has additional behavior for Unity specific (no difference in import) -->
<PackageReference Include="Microsoft.MixedReality.QR" Version="0.5.2085"/>
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" Version="1.0.80" />
<Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" Version="1.0.85" />
</Project>
Loading