Skip to content
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

Changed pod to source form #6582

Merged
merged 8 commits into from
Oct 12, 2021
Merged

Changed pod to source form #6582

merged 8 commits into from
Oct 12, 2021

Conversation

jwoo-msft
Copy link
Member

@jwoo-msft jwoo-msft commented Oct 12, 2021

Related Issue

Fixed #5373, Fixed #3762, Fixed #6559, Fixed #6565

Description

  • changed pod from vendor framework to the source.
  • changed umbrella header from ACFramework.h to AdaptiveCards.h
  • moved c++ & objc++ headers to private

How Verified

  • tested it on swift and objc sample projects.
Microsoft Reviewers: Open in CodeFlow

Copy link
Contributor

@licanhua licanhua left a comment

Choose a reason for hiding this comment

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

:shipit:

Copy link
Contributor

@jonmill jonmill left a comment

Choose a reason for hiding this comment

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

One question but looks good to me!

@jonmill
Copy link
Contributor

jonmill commented Oct 12, 2021

@jwoo-msft - looks like the test project is missing a file rename: 'AdaptiveCards/ACFramework.h' file not found

@jwoo-msft jwoo-msft enabled auto-merge (squash) October 12, 2021 21:45
@jonmill jonmill disabled auto-merge October 12, 2021 23:12
@jonmill
Copy link
Contributor

jonmill commented Oct 12, 2021

Android build stalled - merging

@jonmill jonmill merged commit 27971e1 into main Oct 12, 2021
@jonmill jonmill deleted the jwoo/ios-cocoapod branch October 12, 2021 23:12
jwoo-msft added a commit that referenced this pull request Oct 12, 2021
* changed pod to source form

* moved c++ and objc++ headers to private

* Added resource bundle

* Added excluded files list

This reverts commit 2cd4d4d.

* updated verison in spec

* corrected the version

* tag for ios release

* Fixed Header files in Unit tests & fixed warnings
jonmill pushed a commit that referenced this pull request Oct 13, 2021
* changed pod to source form

* moved c++ and objc++ headers to private

* Added resource bundle

* Added excluded files list

This reverts commit 2cd4d4d.

* updated verison in spec

* corrected the version

* tag for ios release

* Fixed Header files in Unit tests & fixed warnings
paulcam206 added a commit that referenced this pull request Apr 27, 2022
* [Infrastructure] Disable failing push job from js-release.yml (#6563)

Disable push job from js-release.yml to be able to continue package release

* [UWP][Infra] Update nuget files for release (#6576)

* Add new nuspec files

* Fix nuspec

* Update build copy script

* Add dependency to renderer

* 1.5 website schema explorer updates (#6550)

* Updating schema explorer properties

* adding tableCell to toc and attempting whitespace fix

* indentation fix

indentation fix

* Removing filtered prop

Removing filtered prop - it's auto generated in our build

Co-authored-by: RahulAmlekar <raamleka@microsoft.com>

* Custom.props to 1.0.0 for Object model build

* Update dependency version

Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

* Changed pod to source form (#6582) (#6586)

* changed pod to source form

* moved c++ and objc++ headers to private

* Added resource bundle

* Added excluded files list

This reverts commit 2cd4d4d.

* updated verison in spec

* corrected the version

* tag for ios release

* Fixed Header files in Unit tests & fixed warnings

* [Infrastructure][.NET] Update public key location for signing (#6589)

* Update public key name

* Fix name

* Test path

* Test path

* Test path

* Test path

* Test path

* Test path

* Update key to right key

* Updated min supported iOS version  (#6593)

* updated supported min version to iOS 12

* updated podspec

* updated symlinks

* [UWP]: Update ObjectModelProjection.vcxproj to have control flow guard (#6729)

* Update ObjectModelProjection.vcxproj

Add control guard on all flavors of binaries

* Update ObjectModelProjection.vcxproj

* [UWP] Update custom.props version for cfguard patch release

* [UWP]: Don't use AdaptiveImage to render BackgroundImage (#6838)

* increment version

* bring up to master

* update rendering nuspec

* update rendering nuspec

* remove deprecated html renderer

Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>
Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
Co-authored-by: Nassim Amar <namar0x0309@users.noreply.github.com>
Co-authored-by: Paul Campbell (DEP) <paulcam@microsoft.com>
michaelfarnsworth pushed a commit to michaelfarnsworth/AdaptiveCards that referenced this pull request Nov 10, 2022
* changed pod to source form

* moved c++ and objc++ headers to private

* Added resource bundle

* Added excluded files list

This reverts commit 2cd4d4d.

* updated verison in spec

* corrected the version

* tag for ios release

* Fixed Header files in Unit tests & fixed warnings
michaelfarnsworth pushed a commit to michaelfarnsworth/AdaptiveCards that referenced this pull request Nov 10, 2022
* [Infrastructure] Disable failing push job from js-release.yml (microsoft#6563)

Disable push job from js-release.yml to be able to continue package release

* [UWP][Infra] Update nuget files for release (microsoft#6576)

* Add new nuspec files

* Fix nuspec

* Update build copy script

* Add dependency to renderer

* 1.5 website schema explorer updates (microsoft#6550)

* Updating schema explorer properties

* adding tableCell to toc and attempting whitespace fix

* indentation fix

indentation fix

* Removing filtered prop

Removing filtered prop - it's auto generated in our build

Co-authored-by: RahulAmlekar <raamleka@microsoft.com>

* Custom.props to 1.0.0 for Object model build

* Update dependency version

Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

* Changed pod to source form (microsoft#6582) (microsoft#6586)

* changed pod to source form

* moved c++ and objc++ headers to private

* Added resource bundle

* Added excluded files list

This reverts commit 2cd4d4d.

* updated verison in spec

* corrected the version

* tag for ios release

* Fixed Header files in Unit tests & fixed warnings

* [Infrastructure][.NET] Update public key location for signing (microsoft#6589)

* Update public key name

* Fix name

* Test path

* Test path

* Test path

* Test path

* Test path

* Test path

* Update key to right key

* Updated min supported iOS version  (microsoft#6593)

* updated supported min version to iOS 12

* updated podspec

* updated symlinks

* [UWP]: Update ObjectModelProjection.vcxproj to have control flow guard (microsoft#6729)

* Update ObjectModelProjection.vcxproj

Add control guard on all flavors of binaries

* Update ObjectModelProjection.vcxproj

* [UWP] Update custom.props version for cfguard patch release

* [UWP]: Don't use AdaptiveImage to render BackgroundImage (microsoft#6838)

* increment version

* bring up to master

* update rendering nuspec

* update rendering nuspec

* remove deprecated html renderer

Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>
Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
Co-authored-by: Nassim Amar <namar0x0309@users.noreply.github.com>
Co-authored-by: Paul Campbell (DEP) <paulcam@microsoft.com>
rankush pushed a commit to rankush/AdaptiveCards that referenced this pull request May 8, 2024
* changed pod to source form

* moved c++ and objc++ headers to private

* Added resource bundle

* Added excluded files list

This reverts commit 2cd4d4d.

* updated verison in spec

* corrected the version

* tag for ios release

* Fixed Header files in Unit tests & fixed warnings
rankush pushed a commit to rankush/AdaptiveCards that referenced this pull request May 8, 2024
* [Infrastructure] Disable failing push job from js-release.yml (microsoft#6563)

Disable push job from js-release.yml to be able to continue package release

* [UWP][Infra] Update nuget files for release (microsoft#6576)

* Add new nuspec files

* Fix nuspec

* Update build copy script

* Add dependency to renderer

* 1.5 website schema explorer updates (microsoft#6550)

* Updating schema explorer properties

* adding tableCell to toc and attempting whitespace fix

* indentation fix

indentation fix

* Removing filtered prop

Removing filtered prop - it's auto generated in our build

Co-authored-by: RahulAmlekar <raamleka@microsoft.com>

* Custom.props to 1.0.0 for Object model build

* Update dependency version

Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>

* Changed pod to source form (microsoft#6582) (microsoft#6586)

* changed pod to source form

* moved c++ and objc++ headers to private

* Added resource bundle

* Added excluded files list

This reverts commit 2cd4d4d.

* updated verison in spec

* corrected the version

* tag for ios release

* Fixed Header files in Unit tests & fixed warnings

* [Infrastructure][.NET] Update public key location for signing (microsoft#6589)

* Update public key name

* Fix name

* Test path

* Test path

* Test path

* Test path

* Test path

* Test path

* Update key to right key

* Updated min supported iOS version  (microsoft#6593)

* updated supported min version to iOS 12

* updated podspec

* updated symlinks

* [UWP]: Update ObjectModelProjection.vcxproj to have control flow guard (microsoft#6729)

* Update ObjectModelProjection.vcxproj

Add control guard on all flavors of binaries

* Update ObjectModelProjection.vcxproj

* [UWP] Update custom.props version for cfguard patch release

* [UWP]: Don't use AdaptiveImage to render BackgroundImage (microsoft#6838)

* increment version

* bring up to master

* update rendering nuspec

* update rendering nuspec

* remove deprecated html renderer

Co-authored-by: almedina-ms <35784165+almedina-ms@users.noreply.github.com>
Co-authored-by: Rahul Amlekar <rahul.amlekar@mail.mcgill.ca>
Co-authored-by: RahulAmlekar <raamleka@microsoft.com>
Co-authored-by: Rebecca Muraira <rebecch@microsoft.com>
Co-authored-by: Joseph Woo <Joseph.Woo@microsoft.com>
Co-authored-by: Nassim Amar <namar0x0309@users.noreply.github.com>
Co-authored-by: Paul Campbell (DEP) <paulcam@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants