Skip to content

Use public scriptdom nuget #864

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
lucyzhang929 merged 1 commit into from
May 30, 2023
Merged

Use public scriptdom nuget #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -27,5 +27,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 @@ -1862,6 +1862,7 @@
"Microsoft.AspNetCore.Http": "[2.2.2, )",
"Microsoft.Azure.WebJobs": "[3.0.33, )",
"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 @@ -2046,6 +2047,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 @@ -1722,6 +1722,7 @@
"Microsoft.AspNetCore.Http": "[2.2.2, )",
"Microsoft.Azure.WebJobs": "[3.0.33, )",
"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 @@ -1822,6 +1823,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
21 changes: 5 additions & 16 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 @@ -19,35 +19,24 @@
<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" />
<PackageReference Include="Microsoft.AspNetCore.Http" />
<InternalsVisibleTo Include="Microsoft.Azure.WebJobs.Extensions.Sql.Tests"
Key="0024000004800000940000000602000000240000525341310004000001000100272736ad6e5f9586bac2d531eabc3acc666c2f8ec879fa94f8f7b0327d2ff2ed523448f83c3d5c5dd2dfc7bc99c5286b2c125117bf5cbe242b9d41750732b2bdffe649c6efb8e5526d526fdd130095ecdb7bf210809c6cdad8824faa9ac0310ac3cba2aa0523567b2dfa7fe250b30facbd62d4ec99b94ac47c7d3b28f1f6e4c8" />
<InternalsVisibleTo Include="DynamicProxyGenAssembly2"
Key="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
<InternalsVisibleTo Include="Microsoft.Azure.WebJobs.Extensions.Sql.Performance"
Key="0024000004800000940000000602000000240000525341310004000001000100272736ad6e5f9586bac2d531eabc3acc666c2f8ec879fa94f8f7b0327d2ff2ed523448f83c3d5c5dd2dfc7bc99c5286b2c125117bf5cbe242b9d41750732b2bdffe649c6efb8e5526d526fdd130095ecdb7bf210809c6cdad8824faa9ac0310ac3cba2aa0523567b2dfa7fe250b30facbd62d4ec99b94ac47c7d3b28f1f6e4c8" />
<InternalsVisibleTo Include="Microsoft.Azure.WebJobs.Extensions.Sql.Tests" Key="0024000004800000940000000602000000240000525341310004000001000100272736ad6e5f9586bac2d531eabc3acc666c2f8ec879fa94f8f7b0327d2ff2ed523448f83c3d5c5dd2dfc7bc99c5286b2c125117bf5cbe242b9d41750732b2bdffe649c6efb8e5526d526fdd130095ecdb7bf210809c6cdad8824faa9ac0310ac3cba2aa0523567b2dfa7fe250b30facbd62d4ec99b94ac47c7d3b28f1f6e4c8" />
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
<InternalsVisibleTo Include="Microsoft.Azure.WebJobs.Extensions.Sql.Performance" Key="0024000004800000940000000602000000240000525341310004000001000100272736ad6e5f9586bac2d531eabc3acc666c2f8ec879fa94f8f7b0327d2ff2ed523448f83c3d5c5dd2dfc7bc99c5286b2c125117bf5cbe242b9d41750732b2bdffe649c6efb8e5526d526fdd130095ecdb7bf210809c6cdad8824faa9ac0310ac3cba2aa0523567b2dfa7fe250b30facbd62d4ec99b94ac47c7d3b28f1f6e4c8" />
</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="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" />
<Exec Command="dotnet pack &quot;$(MSBuildProjectDirectory)\$(PackageId).csproj&quot; --no-build --include-symbols" />
<ItemGroup>
<_Packages Include=".\bin\$(Configuration)\*.nupkg" />
</ItemGroup>
Expand Down
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
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 @@ -1859,6 +1859,7 @@
"Microsoft.AspNetCore.Http": "[2.2.2, )",
"Microsoft.Azure.WebJobs": "[3.0.33, )",
"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 @@ -1970,6 +1971,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