diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..784a2f3c --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,30 @@ + + + + + latest + + + + Debug + AnyCPU + $(MSBuildThisFileDirectory) + $(RepoRoot)$([MSBuild]::EnsureTrailingSlash(out/$(SubOutRoot))) + $(RepoRoot)eng/ + $(RepoRoot)src/ + $(OutRoot)bin/ + $(OutRoot)obj/$(MSBuildProjectName)/ + $(BaseIntermediateOutputPath)$(Configuration)/ + $(MSBuildProjectName)/ + $(BaseOutputPath)$(Configuration)/$([MSBuild]::EnsureTrailingSlash($(SubOutputPath))) + $(OutRoot)pkg/ + + + + + true + $(EngRoot)key.snk + 0024000004800000940000000602000000240000525341310004000001000100e93024fd5f6737b5f408b39a97e746f673e7c62d690716c6022ee8871b2bc5efcbd8015dd02253302196ded0d9fc0c6bc0e84740f74ca828fed9aebf15272867019cf991484c06b00c7d7aacb34b40ed0ae633f0432df41db65caa4b03f9a0e6974c15aeaa7db2acd902914c0628f0b77d9b7839f530ba04584aed9287159ebd + + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 00000000..82bf85fa --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,19 @@ + + + + + PreserveNewest + + + appsettings.json + PreserveNewest + + + + + + + + + + diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml index 14b86ea4..cac76133 100644 --- a/azure-pipelines-release.yml +++ b/azure-pipelines-release.yml @@ -68,11 +68,11 @@ steps: displayName: 'ESRP CodeSigning: Authenticode' inputs: ConnectedServiceName: 'ESRP Service' - FolderPath: 'src' + FolderPath: 'out/bin' Pattern: 'DurableTask.*.dll' signConfigType: inlineSignParams inlineOperation: | - [ + [ { "KeyCode": "CP-230012", "OperationCode": "SigntoolSign", @@ -138,4 +138,4 @@ steps: # Make the nuget packages available for download in the ADO portal UI - publish: $(build.artifactStagingDirectory) displayName: 'Publish nuget packages to Artifacts' - artifact: PackageOutput \ No newline at end of file + artifact: PackageOutput diff --git a/src/DurableTask.Netherite.AzureFunctions/icon.png b/eng/icon.png similarity index 100% rename from src/DurableTask.Netherite.AzureFunctions/icon.png rename to eng/icon.png diff --git a/sign.snk b/eng/key.snk similarity index 100% rename from sign.snk rename to eng/key.snk diff --git a/eng/targets/InternalsVisibleTo.targets b/eng/targets/InternalsVisibleTo.targets new file mode 100644 index 00000000..cfdf7b7f --- /dev/null +++ b/eng/targets/InternalsVisibleTo.targets @@ -0,0 +1,45 @@ + + + + + $(IntermediateOutputPath)$(MSBuildProjectName).InternalsVisibleTo$(DefaultLanguageSourceExtension) + + + + + false + + + + + + + <_InternalsVisibleToAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"> + <_Parameter1 Condition="'%(InternalsVisibleTo.Key)' != ''">%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.Key) + <_Parameter1 Condition="'%(InternalsVisibleTo.Key)' == '' and '$(PublicKey)' != ''">%(InternalsVisibleTo.Identity), PublicKey=$(PublicKey) + <_Parameter1 Condition="'%(InternalsVisibleTo.Key)' == '' and '$(PublicKey)' == ''">%(InternalsVisibleTo.Identity) + + + + + + + + + + + + + + + + + diff --git a/eng/targets/SharedFiles.targets b/eng/targets/SharedFiles.targets new file mode 100644 index 00000000..310201df --- /dev/null +++ b/eng/targets/SharedFiles.targets @@ -0,0 +1,19 @@ + + + + + $([MSBuild]::EnsureTrailingSlash($(SharedRoot))) + <_SharedSectionCompileIncludes>@(SharedSection->'$(SharedRoot)%(Identity)/**/*.cs') + <_SharedSectionEmbeddedResourceIncludes>@(SharedSection->'$(SharedRoot)%(Identity)/**/*.resx') + + + + + $([System.String]::Copy('%(RecursiveDir)').Replace($([System.IO.Path]::DirectorySeparatorChar.ToString()), '.')) + Shared.%(RecursiveNamespace)%(Filename).resources + + + + + diff --git a/global.json b/global.json new file mode 100644 index 00000000..147f3274 --- /dev/null +++ b/global.json @@ -0,0 +1,10 @@ +{ + "sdk": { + "version": "7.0.102", + "rollForward": "latestFeature" + }, + "msbuild-sdks": { + "Microsoft.Build.NoTargets": "3.5.6", + "Microsoft.Build.Traversal": "3.2.0" + } +} diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props new file mode 100644 index 00000000..18001ce4 --- /dev/null +++ b/samples/Directory.Build.props @@ -0,0 +1,17 @@ + + + + samples/ + Samples + + + + + + false + false + $(MSBuildProjectName) + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 00000000..a3b8c7c1 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,48 @@ + + + + + + + Microsoft Corporation + true + true + https://github.com/microsoft/durabletask-netherite + $(SrcRoot)Shared/ + + + + + + + + + Microsoft + © Microsoft Corporation. All rights reserved. + MIT + $(RepositoryUrl) + $(RepositoryUrl)/releases/ + Azure Task Durable Orchestration Workflow Activity Reliable EventHubs + Microsoft.Azure.$(MSBuildProjectName) + icon.png + + + + + + true + content/SBOM + + + + + + + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 00000000..39cbc28e --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,26 @@ + + + + + + snupkg + true + + + + .$(GITHUB_RUN_NUMBER) + $(VersionPrefix)$(BuildSuffix) + + + + + + + + + + + + + diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index 2f3bbb8d..1ff49507 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -1,62 +1,29 @@  - + netstandard2.1;netstandard2.0;netcoreapp2.2;netcoreapp3.1;net5.0 - latest - true - true - embedded - https://github.com/microsoft/durabletask-netherite - true - true - Microsoft - https://github.com/microsoft/durabletask-netherite - MIT - © Microsoft Corporation. All rights reserved. - true - ..\..\sign.snk Netherite durability provider extension for Azure Durable Functions. - Azure Task Durable Orchestration Workflow Activity Reliable EventHubs - Microsoft.Azure.DurableTask.Netherite.AzureFunctions - icon.png - 1 - 3 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) + 1.3.1 - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) - NETSDK1138 + NETSDK1138 - - - - - - - true - content/SBOM - - - - + - + diff --git a/src/DurableTask.Netherite/AssemblyInfo.cs b/src/DurableTask.Netherite/AssemblyInfo.cs deleted file mode 100644 index f14cd76f..00000000 --- a/src/DurableTask.Netherite/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("DurableTask.Netherite.Tests, PublicKey=" - + "0024000004800000940000000602000000240000525341310004000001000100e93024fd5f6737" - + "b5f408b39a97e746f673e7c62d690716c6022ee8871b2bc5efcbd8015dd02253302196ded0d9fc" - + "0c6bc0e84740f74ca828fed9aebf15272867019cf991484c06b00c7d7aacb34b40ed0ae633f043" - + "2df41db65caa4b03f9a0e6974c15aeaa7db2acd902914c0628f0b77d9b7839f530ba04584aed92" - + "87159ebd")] -[assembly: InternalsVisibleTo("DurableTask.Netherite.AzureFunctions, PublicKey=" - + "0024000004800000940000000602000000240000525341310004000001000100e93024fd5f6737" - + "b5f408b39a97e746f673e7c62d690716c6022ee8871b2bc5efcbd8015dd02253302196ded0d9fc" - + "0c6bc0e84740f74ca828fed9aebf15272867019cf991484c06b00c7d7aacb34b40ed0ae633f043" - + "2df41db65caa4b03f9a0e6974c15aeaa7db2acd902914c0628f0b77d9b7839f530ba04584aed92" - + "87159ebd")] \ No newline at end of file diff --git a/src/DurableTask.Netherite/DurableTask.Netherite.csproj b/src/DurableTask.Netherite/DurableTask.Netherite.csproj index 5bcf854f..0e71f578 100644 --- a/src/DurableTask.Netherite/DurableTask.Netherite.csproj +++ b/src/DurableTask.Netherite/DurableTask.Netherite.csproj @@ -2,53 +2,16 @@ netstandard2.1;netstandard2.0;netcoreapp3.1;net5.0 - latest - true - true - embedded - https://github.com/microsoft/durabletask-netherite - true - true - Microsoft - https://github.com/microsoft/durabletask-netherite - MIT - © Microsoft Corporation. All rights reserved. - true - ..\..\sign.snk Netherite orchestration service provider for the Durable Task Framework. - Azure Task Durable Orchestration Workflow Activity Reliable EventHubs - Microsoft.Azure.DurableTask.Netherite - icon.png true - 1 - 3 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) + 1.3.1 - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) - - - - - - NU5125;NU5048 - - - - - true - content/SBOM - - - @@ -56,11 +19,14 @@ - + - - + + + + + diff --git a/src/DurableTask.Netherite/icon.png b/src/DurableTask.Netherite/icon.png deleted file mode 100644 index eec616f2..00000000 Binary files a/src/DurableTask.Netherite/icon.png and /dev/null differ diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj index d09fd376..98a6b153 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj @@ -2,37 +2,14 @@ netstandard2.0 - Microsoft.Azure.Functions.Worker.Extensions.DurableTask.Netherite - latest - true - true - embedded - https://github.com/microsoft/durabletask-netherite - true - true - Microsoft - https://github.com/microsoft/durabletask-netherite - MIT - © Microsoft Corporation. All rights reserved. - true - ..\..\sign.snk Netherite durability provider extension for Azure Durable Functions. - Azure Task Durable Orchestration Workflow Activity Reliable EventHubs - $(AssemblyName) - icon.png - 1 - 3 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) + 1.3.1 + diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs b/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs index d5521092..59f6b8a7 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs @@ -4,4 +4,4 @@ using Microsoft.Azure.Functions.Worker.Extensions.Abstractions; // This must be updated when updating the version of the package -[assembly: ExtensionInformation("Microsoft.Azure.DurableTask.Netherite.AzureFunctions", "1.3.0", true)] \ No newline at end of file +[assembly: ExtensionInformation("Microsoft.Azure.DurableTask.Netherite.AzureFunctions", "1.3.*", true)] \ No newline at end of file diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/icon.png b/src/Functions.Worker.Extensions.DurableTask.Netherite/icon.png deleted file mode 100644 index eec616f2..00000000 Binary files a/src/Functions.Worker.Extensions.DurableTask.Netherite/icon.png and /dev/null differ diff --git a/src/dirs.proj b/src/dirs.proj index 9c128953..0526c71a 100644 --- a/src/dirs.proj +++ b/src/dirs.proj @@ -1,4 +1,4 @@ - + diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 00000000..1d3e5fcd --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,16 @@ + + + + true + + + + + + false + false + net6.0 + + + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets new file mode 100644 index 00000000..e326d08a --- /dev/null +++ b/test/Directory.Build.targets @@ -0,0 +1,21 @@ + + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + diff --git a/test/DurableTask.Netherite.AzureFunctions.Tests/DurableTask.Netherite.AzureFunctions.Tests.csproj b/test/DurableTask.Netherite.AzureFunctions.Tests/DurableTask.Netherite.AzureFunctions.Tests.csproj index cd5d4343..3340e80a 100644 --- a/test/DurableTask.Netherite.AzureFunctions.Tests/DurableTask.Netherite.AzureFunctions.Tests.csproj +++ b/test/DurableTask.Netherite.AzureFunctions.Tests/DurableTask.Netherite.AzureFunctions.Tests.csproj @@ -1,30 +1,12 @@  - - net6.0 - false - true - 8.0 - ..\..\sign.snk - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + - diff --git a/test/DurableTask.Netherite.Tests/DurableTask.Netherite.Tests.csproj b/test/DurableTask.Netherite.Tests/DurableTask.Netherite.Tests.csproj index 1c2cead0..fee2802f 100644 --- a/test/DurableTask.Netherite.Tests/DurableTask.Netherite.Tests.csproj +++ b/test/DurableTask.Netherite.Tests/DurableTask.Netherite.Tests.csproj @@ -1,21 +1,7 @@  - - net6.0 - false - true - 8.0 - ..\..\sign.snk - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/test/LoadGeneratorApp/LoadGeneratorApp.csproj b/test/LoadGeneratorApp/LoadGeneratorApp.csproj index 0127c2d7..d216f5d1 100644 --- a/test/LoadGeneratorApp/LoadGeneratorApp.csproj +++ b/test/LoadGeneratorApp/LoadGeneratorApp.csproj @@ -1,14 +1,17 @@  + - net6.0 - v4 + net6.0 + v4 + - - - + + + + PreserveNewest @@ -18,4 +21,5 @@ Never + diff --git a/test/PerformanceTests/PerformanceTests.csproj b/test/PerformanceTests/PerformanceTests.csproj index 1014772b..5b5f0cc3 100644 --- a/test/PerformanceTests/PerformanceTests.csproj +++ b/test/PerformanceTests/PerformanceTests.csproj @@ -1,19 +1,24 @@  + net6.0 v4 + false + - + + + Always @@ -34,4 +39,5 @@ Never + \ No newline at end of file