From 2fe886932788d2ce2e80a4fb60d3cd497dcb36c9 Mon Sep 17 00:00:00 2001 From: Simon Dingley Date: Fri, 24 Nov 2023 10:52:25 +0000 Subject: [PATCH 1/2] Fixes a typo in the project folder which will prevent the nuget package from being built --- dist/build-package.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/build-package.ps1 b/dist/build-package.ps1 index faec5562..bd57972e 100644 --- a/dist/build-package.ps1 +++ b/dist/build-package.ps1 @@ -60,7 +60,7 @@ dotnet build ..\uSyncMigrations.sln -c $env /p:$buildParams ""; "##### Packaging"; "----------------------------------" ; "" dotnet pack ..\uSync.Migrations.Core\uSync.Migrations.Core.csproj --no-restore --no-build -c $env -o $outFolder -p:$buildParams -dotnet pack ..\uSync.Migrations.Clients\uSync.Migrations.Client.csproj --no-restore --no-build -c $env -o $outFolder -p:$buildParams +dotnet pack ..\uSync.Migrations.Client\uSync.Migrations.Client.csproj --no-restore --no-build -c $env -o $outFolder -p:$buildParams dotnet pack ..\uSync.Migrations.Migrators\uSync.Migrations.Migrators.csproj --no-restore --no-build -c $env -o $outFolder -p:$buildParams dotnet pack ..\uSync.Migrations\uSync.Migrations.csproj --no-restore --no-build -c $env -o $outFolder -p:$buildParams From 36a1d4f217386dc36137b502839cb5995d0d01b3 Mon Sep 17 00:00:00 2001 From: Simon Dingley Date: Fri, 24 Nov 2023 15:07:51 +0000 Subject: [PATCH 2/2] Fixes #113 and potentially #245 which were broken by recent changes PrePrepareFile should be an override method but the change create a new method hiding the base version. --- .../Handlers/Shared/SharedDataTypeHandler.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uSync.Migrations.Core/Handlers/Shared/SharedDataTypeHandler.cs b/uSync.Migrations.Core/Handlers/Shared/SharedDataTypeHandler.cs index d7968bbf..85b2813c 100644 --- a/uSync.Migrations.Core/Handlers/Shared/SharedDataTypeHandler.cs +++ b/uSync.Migrations.Core/Handlers/Shared/SharedDataTypeHandler.cs @@ -92,8 +92,8 @@ protected override void PrepareFile(XElement source, SyncMigrationContext contex context.DataTypes.GetByDefinition(dtd)!.OriginalEditorAlias = editorAlias; } } - - public void PrePrepareFiles(XElement source, SyncMigrationContext context) + + protected override void PrePrepareFile(XElement source, SyncMigrationContext context) { var editorAlias = GetEditorAlias(source); var (alias, dtd) = GetAliasAndKey(source, context);