-
Notifications
You must be signed in to change notification settings - Fork 494
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.
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
Fix UPM package generation issues for UWP #406
Changes from 18 commits
1ae1353
3189a4c
2531da1
03fdae4
9081e88
658bb48
b425c07
4d77390
454392f
c5de2bb
1e77076
618e7fc
bde9f8e
6510efe
d537816
3b11d75
fec3917
0256aef
1268354
ec7ee91
0d0d69a
72ab445
7276371
bf563f2
a1cdacb
b62aeed
c5b4a79
15eaedd
046c7e2
4d9782b
f97889a
ca479b5
e04883a
740bbb8
eaebdb0
03d7894
6752e09
d11a940
ff148a9
8e34f65
ae9e685
e4c461b
3bee462
0417355
24f6c49
0afe060
ee841ab
661944e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"name": "UnityGLTFEditor", | ||
"references": [ | ||
"UnityGLTFScripts" | ||
], | ||
"optionalUnityReferences": [], | ||
"includePlatforms": [ | ||
"Editor" | ||
], | ||
"excludePlatforms": [], | ||
"allowUnsafeCode": false, | ||
"overrideReferences": false, | ||
"precompiledReferences": [], | ||
"autoReferenced": true, | ||
"defineConstraints": [] | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
{ | ||
"name": "UnityGLTFTests", | ||
"references": [ | ||
"UnityGLTFScripts", | ||
"UnityGLTFEditor" | ||
], | ||
"optionalUnityReferences": [ | ||
"TestAssemblies" | ||
], | ||
"includePlatforms": [], | ||
"excludePlatforms": [], | ||
"allowUnsafeCode": false, | ||
"overrideReferences": false, | ||
"precompiledReferences": [], | ||
"autoReferenced": true, | ||
"defineConstraints": [] | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"name": "UnityGLTFScripts" | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally, the packaging script would not need to maintain a white-list of individual files to package. Did you investigate to see if there are any flags to pass to msbuild to affect what gets output?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ei2kpi-ptc,
We're interested in taking this change. If you don't have time to look into possible msbuild flags, then let's get this change in for now. It currently has a merge conflict with a meta file. If you resolve that conflict, I can go ahead and complete this pull request for you.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AdamMitchell-ms, sorry for the delay. Was pulled into some other work the last two weeks. I can fix the merge conflict but there is still an issue with travis building the right DLLs for UWP because it is on an OSX environment.
I spent some time looking at Azure Pipeline builds and have a process that works well off of my own fork of this project. However, it requires that I grant access to this GitHub repo to the correct Azure pipeline account etc. Who can I work with to get that implemented for this project?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It'll probably take roughly an hour on the phone with someone that has the right access to this repo and to the azure pipeline account we want to use
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Khronoswebmaster , I think you have permissions to do what @ei2kpi-ptc is suggesting. What is the normal process for making changes to branch policies? I've approved the changes in this PR but haven't looked into the azure pipelines build.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ei2kpi-ptc, Is there any reason not to complete this PR in the meantime? Is the travis build issue you mentioned a regression caused by this change? Or already broken and still broken with your change?
If it's the latter (existing issue that's not fixed), then I'll go ahead and complete the PR. If it's a regression, then I'll hold off for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@AdamMitchell-ms Yep, should be safe to accept the PR.
The travis DLL issue is an existing issue which will be fixed once we get Azure Pipelines enabled in this repo (it is already enabled and working in my fork). This PR has travis.yml only building / releasing the .unitypackage version which always had the UWP DLLs missing.
@Khronoswebmaster I set up Azure Pipelines for the UPM package on my fork by using the existing wizard flow which is why I need to work with whoever has the right access to the Azure DevOps account for KhronosGroup.
The yaml version of Azure Pipelines (which would be much more straightforward and similar to travis IMO) seems to have an existing issue with using secret GitHub credentials for the actual Release publishing step.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok @ei2kpi-ptc , I've completed this PR now.