From dad4f88b260ccc1e938822c960ff22c569483e1c Mon Sep 17 00:00:00 2001 From: twsl <45483159+twsl@users.noreply.github.com> Date: Thu, 19 Jan 2023 18:45:23 +0100 Subject: [PATCH 1/7] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 27774b690..29b9a3ed6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - CurrentSemanticVersionBase: '1.0.0' + CurrentSemanticVersionBase: '3.1.0' PreviewNumber: $[counter(variables['CurrentSemanticVersionBase'], 1001)] CurrentSemanticVersion: '$(CurrentSemanticVersionBase)-preview$(PreviewNumber)' NugetPackageVersion: '$(CurrentSemanticVersion)' From 718b679b4a129132f1d795d3170a13ee56a2e8b9 Mon Sep 17 00:00:00 2001 From: twsl <45483159+twsl@users.noreply.github.com> Date: Thu, 19 Jan 2023 19:03:47 +0100 Subject: [PATCH 2/7] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 29b9a3ed6..fd2f57e36 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - CurrentSemanticVersionBase: '3.1.0' + CurrentSemanticVersionBase: '3.2.0' PreviewNumber: $[counter(variables['CurrentSemanticVersionBase'], 1001)] CurrentSemanticVersion: '$(CurrentSemanticVersionBase)-preview$(PreviewNumber)' NugetPackageVersion: '$(CurrentSemanticVersion)' From d299f16c0026841484434036cc5e0f1d9dd239bd Mon Sep 17 00:00:00 2001 From: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com> Date: Sat, 21 Jan 2023 15:34:35 +0200 Subject: [PATCH 3/7] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dcbb5bb01..9adeb8e5b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - CurrentSemanticVersionBase: '3.2.0' + CurrentSemanticVersionBase: '99.0.0' PreviewNumber: $[counter(variables['CurrentSemanticVersionBase'], 1001)] CurrentSemanticVersion: '$(CurrentSemanticVersionBase)-preview$(PreviewNumber)' NugetPackageVersion: '$(CurrentSemanticVersion)' From 2e410d0bf908428d31d8189dc04d49cb734d5c49 Mon Sep 17 00:00:00 2001 From: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com> Date: Sat, 21 Jan 2023 15:35:51 +0200 Subject: [PATCH 4/7] Update azure-pipelines.yml --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9adeb8e5b..676ca2e41 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - CurrentSemanticVersionBase: '99.0.0' + CurrentSemanticVersionBase: '4.1.0' PreviewNumber: $[counter(variables['CurrentSemanticVersionBase'], 1001)] CurrentSemanticVersion: '$(CurrentSemanticVersionBase)-preview$(PreviewNumber)' NugetPackageVersion: '$(CurrentSemanticVersion)' From bdfcd3451b37e70a013520ac0fbdace21bb8c6c3 Mon Sep 17 00:00:00 2001 From: Shaun Lawrence Date: Wed, 1 Mar 2023 20:42:55 +0000 Subject: [PATCH 5/7] GitVersion all the things --- Directory.Build.props | 7 +++++++ .../GitVersion.yml | 19 +++++++++++++++++++ src/GitVersion.yml | 19 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 src/CommunityToolkit.Maui.MediaElement/GitVersion.yml create mode 100644 src/GitVersion.yml diff --git a/Directory.Build.props b/Directory.Build.props index 56c7b098f..7402df21b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -35,4 +35,11 @@ true + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + \ No newline at end of file diff --git a/src/CommunityToolkit.Maui.MediaElement/GitVersion.yml b/src/CommunityToolkit.Maui.MediaElement/GitVersion.yml new file mode 100644 index 000000000..b489149b9 --- /dev/null +++ b/src/CommunityToolkit.Maui.MediaElement/GitVersion.yml @@ -0,0 +1,19 @@ +next-version: 1.0 +assembly-versioning-scheme: MajorMinorPatch +assembly-file-versioning-scheme: MajorMinorPatch +assembly-informational-format: '{InformationalVersion}' +mode: ContinuousDelivery +increment: Inherit +continuous-delivery-fallback-tag: ci +tag-prefix: '[mM]' +major-version-bump-message: '\+semver:\s?(breaking|major)' +minor-version-bump-message: '\+semver:\s?(feature|minor)' +patch-version-bump-message: '\+semver:\s?(fix|patch)' +no-bump-message: '\+semver:\s?(none|skip)' +legacy-semver-padding: 4 +build-metadata-padding: 4 +commits-since-version-source-padding: 4 +tag-pre-release-weight: 60000 +commit-message-incrementing: Enabled +merge-message-formats: {} +update-build-number: true \ No newline at end of file diff --git a/src/GitVersion.yml b/src/GitVersion.yml new file mode 100644 index 000000000..ac4837646 --- /dev/null +++ b/src/GitVersion.yml @@ -0,0 +1,19 @@ +next-version: 1.0 +assembly-versioning-scheme: MajorMinorPatch +assembly-file-versioning-scheme: MajorMinorPatch +assembly-informational-format: '{InformationalVersion}' +mode: ContinuousDelivery +increment: Inherit +continuous-delivery-fallback-tag: ci +tag-prefix: 'v' +major-version-bump-message: '\+semver:\s?(breaking|major)' +minor-version-bump-message: '\+semver:\s?(feature|minor)' +patch-version-bump-message: '\+semver:\s?(fix|patch)' +no-bump-message: '\+semver:\s?(none|skip)' +legacy-semver-padding: 4 +build-metadata-padding: 4 +commits-since-version-source-padding: 4 +tag-pre-release-weight: 60000 +commit-message-incrementing: Enabled +merge-message-formats: {} +update-build-number: true \ No newline at end of file From fa0c4dcc7d23e388b9bca49386d402b1bd805fb2 Mon Sep 17 00:00:00 2001 From: Shaun Lawrence Date: Wed, 1 Mar 2023 20:54:07 +0000 Subject: [PATCH 6/7] Dummy commit --- src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs b/src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs index 2f4de89d1..a7befedac 100644 --- a/src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs +++ b/src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs @@ -45,7 +45,7 @@ static void ForceUpdateCellSize(CollectionView collectionView, Size size, Point? static UICollectionViewController? GetController(CollectionView collectionView) { var handler = collectionView.Handler as Microsoft.Maui.Controls.Handlers.Items.CollectionViewHandler; - return handler?.Controller; + return null;// handler?.Controller; } static UICollectionViewCell? GetCellByPoint(UICollectionViewCell[] cells, CGPoint point) From f9dd0c4577b6d5638f30247fcee34cb1ebd57b3e Mon Sep 17 00:00:00 2001 From: Shaun Lawrence Date: Wed, 1 Mar 2023 21:03:17 +0000 Subject: [PATCH 7/7] Revert "Dummy commit" This reverts commit fa0c4dcc7d23e388b9bca49386d402b1bd805fb2. --- src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs b/src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs index a7befedac..2f4de89d1 100644 --- a/src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs +++ b/src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs @@ -45,7 +45,7 @@ static void ForceUpdateCellSize(CollectionView collectionView, Size size, Point? static UICollectionViewController? GetController(CollectionView collectionView) { var handler = collectionView.Handler as Microsoft.Maui.Controls.Handlers.Items.CollectionViewHandler; - return null;// handler?.Controller; + return handler?.Controller; } static UICollectionViewCell? GetCellByPoint(UICollectionViewCell[] cells, CGPoint point)