diff --git a/DurableTask.Netherite.sln b/DurableTask.Netherite.sln index 42971069..08ee2a5a 100644 --- a/DurableTask.Netherite.sln +++ b/DurableTask.Netherite.sln @@ -24,6 +24,9 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerformanceTests", "test\PerformanceTests\PerformanceTests.csproj", "{DD1E1B3F-4FA2-4F3A-9AE1-6B2A0B864AAF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D33AB157-04B9-4BAD-B580-C3C87C17828C}" + ProjectSection(SolutionItems) = preProject + src\common.props = src\common.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4A7226CF-57BF-4CA3-A4AC-91A398A1D84B}" EndProject @@ -41,7 +44,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TokenCredentialDF", "sample EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TokenCredentialDTFx", "samples\TokenCredentialDTFx\TokenCredentialDTFx.csproj", "{FBFF0814-E6C0-489A-ACCF-9D0699219621}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Functions.Worker.Extensions.DurableTask.Netherite", "src\Functions.Worker.Extensions.DurableTask.Netherite\Functions.Worker.Extensions.DurableTask.Netherite.csproj", "{3E17402B-3F65-4E5B-B752-48AD56B81208}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Functions.Worker.Extensions.DurableTask.Netherite", "src\Functions.Worker.Extensions.DurableTask.Netherite\Functions.Worker.Extensions.DurableTask.Netherite.csproj", "{3E17402B-3F65-4E5B-B752-48AD56B81208}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index d26eb1fd..3df2e8d5 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -22,17 +22,9 @@ icon.png - - - 1 - 5 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) - + + + diff --git a/src/DurableTask.Netherite/DurableTask.Netherite.csproj b/src/DurableTask.Netherite/DurableTask.Netherite.csproj index 2988cad5..e12df7cd 100644 --- a/src/DurableTask.Netherite/DurableTask.Netherite.csproj +++ b/src/DurableTask.Netherite/DurableTask.Netherite.csproj @@ -22,18 +22,8 @@ true - - - 1 - 5 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) - - + + 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 1ea28424..7806b688 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 @@ -22,18 +22,8 @@ icon.png - - - - 1 - 5 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) - + + @@ -50,4 +40,14 @@ + + + + <_Parameter1>Microsoft.Azure.DurableTask.Netherite.AzureFunctions + <_Parameter2>$(PackageVersion) + <_Parameter3>true + <_Parameter3_IsLiteral>true + + + diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs b/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs deleted file mode 100644 index 70f63c14..00000000 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. - -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.5.0", true)] \ No newline at end of file diff --git a/src/common.props b/src/common.props new file mode 100644 index 00000000..200b1b5b --- /dev/null +++ b/src/common.props @@ -0,0 +1,14 @@ + + + + + 1 + 5 + 1 + $(MajorVersion).$(MinorVersion).$(PatchVersion) + + $(MajorVersion).0.0.0 + .$(GITHUB_RUN_NUMBER) + $(VersionPrefix)$(BuildSuffix) + + \ No newline at end of file