diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e068a90b..0c4ca1f0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -63,7 +63,7 @@ jobs: FolderPath: '$(Build.SourcesDirectory)/bin/$(BuildConfiguration)' Pattern: | /PAModel/Microsoft.PowerPlatform.Formulas.Tools.dll - /Microsoft.PowerPlatform.PowerApps.Persistence/Microsoft.PowerPlatform.PowerApps.Persistence.dll + /Persistence/Microsoft.PowerPlatform.PowerApps.Persistence.dll UseMinimatch: true signConfigType: inlineSignParams inlineOperation: | @@ -115,7 +115,7 @@ jobs: inputs: command: 'run' projects: '$(Build.SourcesDirectory)/targets/targets.csproj' - arguments: '-- pack -c $(BuildConfiguration) -p .\src\PAModel\Microsoft.PowerPlatform.Formulas.Tools.csproj .\src\Microsoft.PowerPlatform.PowerApps.Persistence\Microsoft.PowerPlatform.PowerApps.Persistence.csproj' + arguments: '-- pack -c $(BuildConfiguration) -p .\src\PAModel\Microsoft.PowerPlatform.Formulas.Tools.csproj .\src\Persistence\Microsoft.PowerPlatform.PowerApps.Persistence.csproj' - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@3 displayName: 'ESRP sign nuget packages' diff --git a/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj b/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj index a99e9f5a..ddb5d0b2 100644 --- a/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj +++ b/src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj @@ -70,6 +70,6 @@ - + diff --git a/src/PASopa.sln b/src/PASopa.sln index 8d48a840..78c6ddc3 100644 --- a/src/PASopa.sln +++ b/src/PASopa.sln @@ -16,9 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\.editorconfig = ..\.editorconfig EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerPlatform.PowerApps.Persistence", "Microsoft.PowerPlatform.PowerApps.Persistence\Microsoft.PowerPlatform.PowerApps.Persistence.csproj", "{906B4EA5-F287-4D0E-A511-0D89B2DD9C14}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerPlatform.PowerApps.Persistence", "Persistence\Microsoft.PowerPlatform.PowerApps.Persistence.csproj", "{906B4EA5-F287-4D0E-A511-0D89B2DD9C14}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.PowerPlatform.PowerApps.Persistence.Tests", "Microsoft.PowerPlatform.PowerApps.Persistence.Tests\Microsoft.PowerPlatform.PowerApps.Persistence.Tests.csproj", "{8AB1C901-FE5E-44BF-AA21-B8F20A9D7CDD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.PowerPlatform.PowerApps.Persistence.Tests", "Persistence.Tests\Microsoft.PowerPlatform.PowerApps.Persistence.Tests.csproj", "{8AB1C901-FE5E-44BF-AA21-B8F20A9D7CDD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/AssemblyInfo.cs b/src/Persistence.Tests/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/AssemblyInfo.cs rename to src/Persistence.Tests/AssemblyInfo.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/GlobalSuppressions.cs b/src/Persistence.Tests/GlobalSuppressions.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/GlobalSuppressions.cs rename to src/Persistence.Tests/GlobalSuppressions.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/Microsoft.PowerPlatform.PowerApps.Persistence.Tests.csproj b/src/Persistence.Tests/Microsoft.PowerPlatform.PowerApps.Persistence.Tests.csproj similarity index 89% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/Microsoft.PowerPlatform.PowerApps.Persistence.Tests.csproj rename to src/Persistence.Tests/Microsoft.PowerPlatform.PowerApps.Persistence.Tests.csproj index bcdf8867..adea0f14 100644 --- a/src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/Microsoft.PowerPlatform.PowerApps.Persistence.Tests.csproj +++ b/src/Persistence.Tests/Microsoft.PowerPlatform.PowerApps.Persistence.Tests.csproj @@ -25,7 +25,7 @@ + Include="..\Persistence\Microsoft.PowerPlatform.PowerApps.Persistence.csproj" /> diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/Yaml/YamlDeserializerTests.cs b/src/Persistence.Tests/Yaml/YamlDeserializerTests.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/Yaml/YamlDeserializerTests.cs rename to src/Persistence.Tests/Yaml/YamlDeserializerTests.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/Yaml/YamlSerializerTests.cs b/src/Persistence.Tests/Yaml/YamlSerializerTests.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence.Tests/Yaml/YamlSerializerTests.cs rename to src/Persistence.Tests/Yaml/YamlSerializerTests.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Attributes/FirstClassAttribute.cs b/src/Persistence/Attributes/FirstClassAttribute.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Attributes/FirstClassAttribute.cs rename to src/Persistence/Attributes/FirstClassAttribute.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Collections/ControlPropertiesCollection.cs b/src/Persistence/Collections/ControlPropertiesCollection.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Collections/ControlPropertiesCollection.cs rename to src/Persistence/Collections/ControlPropertiesCollection.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Extensions/TypeExtensions.cs b/src/Persistence/Extensions/TypeExtensions.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Extensions/TypeExtensions.cs rename to src/Persistence/Extensions/TypeExtensions.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Microsoft.PowerPlatform.PowerApps.Persistence.csproj b/src/Persistence/Microsoft.PowerPlatform.PowerApps.Persistence.csproj similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Microsoft.PowerPlatform.PowerApps.Persistence.csproj rename to src/Persistence/Microsoft.PowerPlatform.PowerApps.Persistence.csproj diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/BuiltInTemplatesUris.cs b/src/Persistence/Models/BuiltInTemplatesUris.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/BuiltInTemplatesUris.cs rename to src/Persistence/Models/BuiltInTemplatesUris.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Button.cs b/src/Persistence/Models/Button.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Button.cs rename to src/Persistence/Models/Button.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Control.cs b/src/Persistence/Models/Control.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Control.cs rename to src/Persistence/Models/Control.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/ControlProperty.cs b/src/Persistence/Models/ControlProperty.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/ControlProperty.cs rename to src/Persistence/Models/ControlProperty.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/ControlPropertyValue.cs b/src/Persistence/Models/ControlPropertyValue.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/ControlPropertyValue.cs rename to src/Persistence/Models/ControlPropertyValue.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/CustomControl.cs b/src/Persistence/Models/CustomControl.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/CustomControl.cs rename to src/Persistence/Models/CustomControl.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Screen.cs b/src/Persistence/Models/Screen.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Screen.cs rename to src/Persistence/Models/Screen.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Text.cs b/src/Persistence/Models/Text.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Models/Text.cs rename to src/Persistence/Models/Text.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/ControlPropertiesCollectionConverter.cs b/src/Persistence/Yaml/ControlPropertiesCollectionConverter.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/ControlPropertiesCollectionConverter.cs rename to src/Persistence/Yaml/ControlPropertiesCollectionConverter.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/ControlPropertyConverter.cs b/src/Persistence/Yaml/ControlPropertyConverter.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/ControlPropertyConverter.cs rename to src/Persistence/Yaml/ControlPropertyConverter.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/FirstClassControlsEmitter.cs b/src/Persistence/Yaml/FirstClassControlsEmitter.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/FirstClassControlsEmitter.cs rename to src/Persistence/Yaml/FirstClassControlsEmitter.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/SerializerBuilderExtensions.cs b/src/Persistence/Yaml/SerializerBuilderExtensions.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/SerializerBuilderExtensions.cs rename to src/Persistence/Yaml/SerializerBuilderExtensions.cs diff --git a/src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/YamlSerializationFactory.cs b/src/Persistence/Yaml/YamlSerializationFactory.cs similarity index 100% rename from src/Microsoft.PowerPlatform.PowerApps.Persistence/Yaml/YamlSerializationFactory.cs rename to src/Persistence/Yaml/YamlSerializationFactory.cs diff --git a/src/Persistence/packages.lock.json b/src/Persistence/packages.lock.json new file mode 100644 index 00000000..f4373772 --- /dev/null +++ b/src/Persistence/packages.lock.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "dependencies": { + "net7.0": { + "YamlDotNet": { + "type": "Direct", + "requested": "[15.1.0, )", + "resolved": "15.1.0", + "contentHash": "fXrqmKkzBtXeJiHEsZOPEWkonHweiwk/l0Hqhz4yMIZPh57kZy03Xbj2/e8HV1QIkTw7yeBe9bbphuE3YiI4vQ==" + } + } + } +} \ No newline at end of file