diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index 7c879c4a2e..ca0d81e371 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -14,39 +14,38 @@ "DotnetTool" ], "Exclusions": { + "NEUTRAL_RESOURCES_LANGUAGE": { + "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg." + }, "WRONG_PUBLICKEYTOKEN": { + "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", - "tools/any/any/runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", - "tools/any/any/runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg." }, "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": { + "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", - "tools/any/any/runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", - "tools/any/any/runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg." }, "ASSEMBLY_FILE_VERSION_MISMATCH": { - "tools/any/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", + "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", - "tools/any/any/runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", + "tools/any/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", - "tools/any/any/runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg." }, "ASSEMBLY_VERSION_MISMATCH": { - "tools/any/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", + "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", - "tools/any/any/runtimes/win/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", + "tools/any/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.", - "tools/any/any/runtimes/unix/lib/netstandard2.0/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg." } @@ -58,15 +57,11 @@ ], "Exclusions": { "NEUTRAL_RESOURCES_LANGUAGE": { - "tools/any/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg." }, "SERVICING_ATTRIBUTE": { "tools/any/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg." }, - "VERSION_INFORMATIONALVERSION": { - "tools/any/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg." - }, "WRONG_PUBLICKEYTOKEN": { "tools/any/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.", "tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg." diff --git a/build/dependencies.props b/build/dependencies.props index 28af66d0ab..79fe354e08 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,17 +3,17 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview3-17002 + 2.1.0-preview3-17005 2.1.0-preview3-32110 2.1.0-preview3-32110 2.1.0-preview3-32110 2.1.0-preview3-32110 2.1.0-preview3-32110 2.0.0 - 2.1.0-preview3-26331-01 + 2.1.0-preview3-26410-06 15.6.1 - 4.5.0-preview3-26331-02 - 4.5.0-preview3-26331-02 + 4.5.0-preview3-26409-05 + 4.5.0-preview3-26409-05 9.0.1 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c879a84a90..c6329a2176 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview3-17002 -commithash:b8e4e6ab104adc94c0719bb74229870e9b584a7f +version:2.1.0-preview3-17005 +commithash:6e4c983b65fe55ba71bfb746df37e6bf2726ac1c diff --git a/src/dotnet-sql-cache/dotnet-sql-cache.csproj b/src/dotnet-sql-cache/dotnet-sql-cache.csproj index 71b526b974..64d2c8b51b 100644 --- a/src/dotnet-sql-cache/dotnet-sql-cache.csproj +++ b/src/dotnet-sql-cache/dotnet-sql-cache.csproj @@ -12,6 +12,7 @@ +