Skip to content

ship dx d3dcompiler_43x64#10110

Merged
mjkkirschner merged 3 commits intoDynamoDS:masterfrom
mjkkirschner:shipd3dcom
Nov 14, 2019
Merged

ship dx d3dcompiler_43x64#10110
mjkkirschner merged 3 commits intoDynamoDS:masterfrom
mjkkirschner:shipd3dcom

Conversation

@mjkkirschner
Copy link
Member

@mjkkirschner mjkkirschner commented Nov 4, 2019 •
edited
Loading

Purpose

Restores missing dependency on windows 10 machines which do not have older dx shader compiler by default included with their installs any longer. (windows 7)

Screen Shot 2019-11-04 at 6 47 27 PM

Screen Shot 2019-11-13 at 2 27 57 PM

The compiler is part of the dx 2010 redistributable and is added to the dx install folder we have committed to the repo - at build time this dll is copied to the bin folder.

Declarations

Check these if you believe they are true

  • The code base is in a better state after this PR
  • Is documented according to the standards
  • The level of testing this PR includes is appropriate
  • User facing strings, if any, are extracted into *.resx files
  • All tests pass using the self-service CI.
  • Snapshot of UI changes, if any.
  • Changes to the API follow Semantic Versioning, and are documented in the API Changes document.

Reviewers

@aparajit-pratap
@Dewb

FYIs

@smangarole
@Amoursol

@mjkkirschner mjkkirschner added the DNM Do not merge. For PRs. label Nov 4, 2019
@mjkkirschner mjkkirschner removed the DNM Do not merge. For PRs. label Nov 13, 2019
@mjkkirschner
update lic file
d0be53d 
update about box
add dx lic files so we can link to them
@mjkkirschner mjkkirschner added the PTAL Please Take A Look 👀 label Nov 13, 2019
@mjkkirschner mjkkirschner changed the title ship dxcompiler 43 ship dx d3dcompiler_43x64 Nov 13, 2019
Dewb
Dewb approved these changes Nov 13, 2019
View reviewed changes
src/DynamoCoreWpf/DynamoCoreWpf.csproj
<Content Include="..\..\tools\install\Extra\DirectX\D3DCompiler_43.dll">
<Link>D3DCompiler_43.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Copy link
Contributor

@Dewb Dewb Nov 13, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think using If Newer instead of Always more consistently on content like this would speed up the local build cycle.

@mjkkirschner
Copy link
Member Author

mjkkirschner commented Nov 14, 2019 •
edited
Loading

I'm getting failing self serve results, trying to see whats going on. (Just a time out, so no clear reason)

seems to just be a fluke, next run past in record time 😉

@mjkkirschner mjkkirschner removed the PTAL Please Take A Look 👀 label Nov 14, 2019
@mjkkirschner mjkkirschner merged commit bd01b9b into DynamoDS:master Nov 14, 2019
@QilongTang QilongTang mentioned this pull request Nov 2, 2020
Merged
8 tasks
QilongTang added a commit that referenced this pull request Nov 3, 2020
@QilongTang
Revert changes (#10110) (#11226)
8bd8e77 
* Revert changes

* Revert "Revert changes"

This reverts commit 31aedac.

* Remove only D3DCompiler_43.dll
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aparajit-pratap aparajit-pratap aparajit-pratap approved these changes

+1 more reviewer

@Dewb Dewb Dewb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@mjkkirschner @Dewb @aparajit-pratap