Merge branch 'release/2.1' into dev
This commit is contained in:
commit
6e9cb0260c
|
|
@ -27,6 +27,20 @@
|
||||||
"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/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/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/win/lib/netstandard2.0/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.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/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."
|
||||||
|
},
|
||||||
|
"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.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/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."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -54,9 +68,11 @@
|
||||||
"tools/any/any/System.Runtime.CompilerServices.Unsafe.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."
|
||||||
},
|
},
|
||||||
"ASSEMBLY_FILE_VERSION_MISMATCH": {
|
"ASSEMBLY_FILE_VERSION_MISMATCH": {
|
||||||
|
"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."
|
"tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
|
||||||
},
|
},
|
||||||
"ASSEMBLY_VERSION_MISMATCH": {
|
"ASSEMBLY_VERSION_MISMATCH": {
|
||||||
|
"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."
|
"tools/any/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue