Skip to content

Merge latest from main into trigger #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Charles-Gagnon merged 7 commits into from
Jun 2, 2023
Merged

Merge latest from main into trigger #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f7a26b8
Fix the race condition by adding the extension reference to build fir…
MaddyDev May 3, 2023
3621af7
pack and copy the sql nupkg to local-packages after build (#853)
MaddyDev May 17, 2023
d7cd728
Remove doc/sample references to preview bundle (#744)
Charles-Gagnon May 23, 2023
780a8fd
use scriptdom nuget (#864)
lucyzhang929 May 30, 2023
9ea188d
Merge branch 'main' into chgagnon/mergeMain
Charles-Gagnon May 31, 2023
d7a3bbd
Revert "Remove doc/sample references to preview bundle (#744)"
Charles-Gagnon May 31, 2023
3a93cb6
Fix nuget package versioning
Charles-Gagnon Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,6 @@
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Storage.Queues" Version="5.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageVersion Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="161.8817.2" />
</ItemGroup>
</Project>
Binary file removed lib/Microsoft.SqlServer.TransactSql.ScriptDom.dll
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions performance/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1863,6 +1863,7 @@
"Microsoft.AspNetCore.Http": "[2.2.2, )",
"Microsoft.Azure.WebJobs": "[3.0.36, )",
"Microsoft.Data.SqlClient": "[5.0.1, )",
"Microsoft.SqlServer.TransactSql.ScriptDom": "[161.8817.2, )",
"Newtonsoft.Json": "[13.0.2, )",
"System.Runtime.Caching": "[5.0.0, )",
"morelinq": "[3.3.2, )"
Expand Down Expand Up @@ -2048,6 +2049,12 @@
"Microsoft.TestPlatform.TestHost": "17.4.0"
}
},
"Microsoft.SqlServer.TransactSql.ScriptDom": {
"type": "CentralTransitive",
"requested": "[161.8817.2, )",
"resolved": "161.8817.2",
"contentHash": "3j5dQjTPLw51AvXwJTL9sXiTMTY5Y2lvdzjtV7yOEsPUSIl+P2IsxLn7KFhGGHtwr4MOsUdAWnQ3xcrpG8tTXA=="
},
"Moq": {
"type": "CentralTransitive",
"requested": "[4.18.2, )",
Expand Down
7 changes: 7 additions & 0 deletions samples/samples-csharp/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1723,6 +1723,7 @@
"Microsoft.AspNetCore.Http": "[2.2.2, )",
"Microsoft.Azure.WebJobs": "[3.0.36, )",
"Microsoft.Data.SqlClient": "[5.0.1, )",
"Microsoft.SqlServer.TransactSql.ScriptDom": "[161.8817.2, )",
"Newtonsoft.Json": "[13.0.2, )",
"System.Runtime.Caching": "[5.0.0, )",
"morelinq": "[3.3.2, )"
Expand Down Expand Up @@ -1823,6 +1824,12 @@
"Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0"
}
},
"Microsoft.SqlServer.TransactSql.ScriptDom": {
"type": "CentralTransitive",
"requested": "[161.8817.2, )",
"resolved": "161.8817.2",
"contentHash": "3j5dQjTPLw51AvXwJTL9sXiTMTY5Y2lvdzjtV7yOEsPUSIl+P2IsxLn7KFhGGHtwr4MOsUdAWnQ3xcrpG8tTXA=="
},
"morelinq": {
"type": "CentralTransitive",
"requested": "[3.3.2, )",
Expand Down
7 changes: 6 additions & 1 deletion samples/samples-outofproc/Microsoft.Azure.WebJobs.Extensions.Sql.SamplesOutOfProc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@
<PackageReference Include="Newtonsoft.Json" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../../Worker.Extensions.Sql/src/Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj" />
<ProjectReference
Include="..\..\Worker.Extensions.Sql\src\Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj" />
<!-- We want to build the extension project first since this project references the package
produced by building that. But we don't want it as an actual runtime depdendency -->
<ProjectReference Include="..\..\src\Microsoft.Azure.WebJobs.Extensions.Sql.csproj"
ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
Expand Down
19 changes: 8 additions & 11 deletions src/Microsoft.Azure.WebJobs.Extensions.Sql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<!-- Default Version for dev -->
<Version>99.99.99</Version>
<IsPackable>true</IsPackable>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageId>Microsoft.Azure.WebJobs.Extensions.Sql</PackageId>
<PackageTags>Microsoft Azure WebJobs AzureFunctions SQL AzureSQL</PackageTags>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
Expand All @@ -20,6 +19,7 @@
<PackageReference Include="Microsoft.Azure.WebJobs" />
<PackageReference Include="Microsoft.Data.SqlClient" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
<PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" />
<PackageReference Include="morelinq" />
<PackageReference Include="System.Runtime.Caching" />
<PackageReference Include="Newtonsoft.Json" />
Expand All @@ -30,24 +30,21 @@
</ItemGroup>

<ItemGroup>
<!-- ScriptDom is currently only available officially through the DacFx NuGet package. Rather than referencing DacFx
for one ScriptDom API, we are getting the ScriptDom dll from the latest DacFx NuGet package. -->
<Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom">
<HintPath>..\lib\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
</Reference>
<None Include="..\Images\pkgicon.png" Pack="true" PackagePath="" />
<None Include="..\lib\Microsoft.SqlServer.TransactSql.ScriptDom.dll" Pack="true" PackagePath="lib/$(TargetFramework)" />
<None Include="..\README.md" Pack="true" PackagePath="" />
</ItemGroup>
<Target Name="CopyNupkg" AfterTargets="Pack">
<Target Name="PackAndCopyNupkg" AfterTargets="Build">
<!-- Removed the GeneratePackageOnBuild and adding this explicit Pack command to run post build
and also adding the copy package to local-packages to be available for the worker extension project. -->
<Exec Command="dotnet pack &quot;$(MSBuildProjectDirectory)\$(PackageId).csproj&quot; --no-build --include-symbols -p:Version=$(Version)" />
<ItemGroup>
<_Packages Include=".\bin\$(Configuration)\*.nupkg" />
</ItemGroup>
<Copy SourceFiles="@(_Packages)" DestinationFolder="../local-packages" />
<Copy SourceFiles="@(_Packages)" DestinationFolder="..\local-packages" />
<Message Text="Copied sql .nupkg to local-packages" Importance="high" />
</Target>
<Target Name="RemoveNugetPackageCache" BeforeTargets="Build">
<RemoveDir Directories="$(NugetPackageRoot)/$(PackageId.ToLower())/99.99.99"></RemoveDir>
<Message Text="Deleted nuget cache for $(PackageId.ToLower())/99.99.99" Importance="high" />
<RemoveDir Directories="$(NugetPackageRoot)\$(PackageId.ToLower())\$(Version)"></RemoveDir>
<Message Text="Deleted nuget cache for $(PackageId.ToLower())\$(Version)" Importance="high" />
</Target>
</Project>
6 changes: 6 additions & 0 deletions src/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@
"Microsoft.SourceLink.Common": "1.1.1"
}
},
"Microsoft.SqlServer.TransactSql.ScriptDom": {
"type": "Direct",
"requested": "[161.8817.2, )",
"resolved": "161.8817.2",
"contentHash": "3j5dQjTPLw51AvXwJTL9sXiTMTY5Y2lvdzjtV7yOEsPUSIl+P2IsxLn7KFhGGHtwr4MOsUdAWnQ3xcrpG8tTXA=="
},
"morelinq": {
"type": "Direct",
"requested": "[3.3.2, )",
Expand Down
9 changes: 7 additions & 2 deletions test-outofproc/test-outofproc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Worker.Extensions.Sql\src\Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj" />
<ProjectReference
Include="..\Worker.Extensions.Sql\src\Microsoft.Azure.Functions.Worker.Extensions.Sql.csproj" />
<!-- We want to build the extension project first since this project references the package
produced by building that. But we don't want it as an actual runtime depdendency -->
<ProjectReference Include="..\src\Microsoft.Azure.WebJobs.Extensions.Sql.csproj"
ReferenceOutputAssembly="false" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
Expand All @@ -27,6 +32,6 @@
</None>
</ItemGroup>
<ItemGroup>
<Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext"/>
<Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
</ItemGroup>
</Project>
7 changes: 7 additions & 0 deletions test/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1869,6 +1869,7 @@
"Microsoft.AspNetCore.Http": "[2.2.2, )",
"Microsoft.Azure.WebJobs": "[3.0.36, )",
"Microsoft.Data.SqlClient": "[5.0.1, )",
"Microsoft.SqlServer.TransactSql.ScriptDom": "[161.8817.2, )",
"Newtonsoft.Json": "[13.0.2, )",
"System.Runtime.Caching": "[5.0.0, )",
"morelinq": "[3.3.2, )"
Expand Down Expand Up @@ -1980,6 +1981,12 @@
"System.Text.Encodings.Web": "4.7.2"
}
},
"Microsoft.SqlServer.TransactSql.ScriptDom": {
"type": "CentralTransitive",
"requested": "[161.8817.2, )",
"resolved": "161.8817.2",
"contentHash": "3j5dQjTPLw51AvXwJTL9sXiTMTY5Y2lvdzjtV7yOEsPUSIl+P2IsxLn7KFhGGHtwr4MOsUdAWnQ3xcrpG8tTXA=="
},
"morelinq": {
"type": "CentralTransitive",
"requested": "[3.3.2, )",
Expand Down