Skip to content

Changed pod to source form - #6582

Merged
jonmill merged 8 commits into
mainfrom
jwoo/ios-cocoapod
Oct 12, 2021
Merged

Changed pod to source form#6582
jonmill merged 8 commits into
mainfrom
jwoo/ios-cocoapod

Conversation

@jwoo-msft

@jwoo-msft jwoo-msft commented Oct 12, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

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

licanhua
licanhua approved these changes Oct 12, 2021
View reviewed changes

@licanhua licanhua left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

:shipit:

jonmill
jonmill reviewed Oct 12, 2021
View reviewed changes
Comment thread source/ios/tools/AdaptiveCards.podspec Outdated
jonmill
jonmill approved these changes Oct 12, 2021
View reviewed changes

@jonmill jonmill left a comment

Copy link
Copy Markdown
Contributor

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

jonmill commented Oct 12, 2021

Copy link
Copy Markdown
Contributor

@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

jonmill commented Oct 12, 2021

Copy link
Copy Markdown
Contributor

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
@jwoo-msft
Changed pod to source form (#6582)
c1297e7 
* 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
@jwoo-msft
Changed pod to source form (#6582) (#6586)
2f52e5c 
* 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
@beervoley @almedina-ms
@rahulamlekar RahulAmlekar Rebecca Muraira @jwoo-msft @namar0x0309 @paulcam206
[UWP Nuget]: Add ObjectModel .nuspec (#7204)
2b07a25 
* [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
@jwoo-msft @michaelfarnsworth
Changed pod to source form (microsoft#6582)
fa21147 
* 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
@beervoley @almedina-ms
@rahulamlekar RahulAmlekar Rebecca Muraira @jwoo-msft @namar0x0309 @paulcam206 @michaelfarnsworth
[UWP Nuget]: Add ObjectModel .nuspec (microsoft#7204)
f8365d6 
* [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
@jwoo-msft
Changed pod to source form (microsoft#6582)
e429116 
* 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
@beervoley @almedina-ms
@rahulamlekar RahulAmlekar Rebecca Muraira @jwoo-msft @namar0x0309 @paulcam206
[UWP Nuget]: Add ObjectModel .nuspec (microsoft#7204)
4e3c18e 
* [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

Reviewers

2 more reviewers
@jonmill jonmill jonmill approved these changes
@licanhua licanhua licanhua approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

3 participants

@jwoo-msft @jonmill @licanhua