diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..54379ca515 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,108 @@ + + + + true + true + 6.35.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/build/Engineering.props b/eng/build/Engineering.props index 796658a032..2b494ebd6b 100644 --- a/eng/build/Engineering.props +++ b/eng/build/Engineering.props @@ -5,21 +5,12 @@ $(EngBuildRoot)Workers.props - - - - $(WarningsNotAsErrors)NU1901;NU1902;NU1903; - $(WarningsNotAsErrors)NU1904; - $(WarningsAsErrors)NU1904; - moderate - all - - latest $(EngResourceRoot)key.snk $(RepoRoot)src.ruleset - $(NoWarn);NU1701;NU5104 + + $(NoWarn);NU1701;NU5104;NU1507 embedded true true @@ -30,12 +21,22 @@ - - + + + + + + + $(WarningsNotAsErrors)NU1901;NU1902;NU1903; + $(WarningsNotAsErrors)NU1904; + $(WarningsAsErrors)NU1904; + moderate + all + diff --git a/eng/build/Workers.Dotnet.props b/eng/build/Workers.Dotnet.props index e966076772..d7dd357e30 100644 --- a/eng/build/Workers.Dotnet.props +++ b/eng/build/Workers.Dotnet.props @@ -1,7 +1,7 @@ - + diff --git a/eng/build/Workers.Java.props b/eng/build/Workers.Java.props index f77083a15a..b7faf724ea 100644 --- a/eng/build/Workers.Java.props +++ b/eng/build/Workers.Java.props @@ -1,7 +1,7 @@ - + diff --git a/eng/build/Workers.Node.props b/eng/build/Workers.Node.props index 961f06b52e..afb3827327 100644 --- a/eng/build/Workers.Node.props +++ b/eng/build/Workers.Node.props @@ -1,7 +1,7 @@ - + diff --git a/eng/build/Workers.Powershell.props b/eng/build/Workers.Powershell.props index 4a4b76c619..b68a3c05d5 100644 --- a/eng/build/Workers.Powershell.props +++ b/eng/build/Workers.Powershell.props @@ -1,9 +1,9 @@ - - - + + + diff --git a/eng/build/Workers.Python.props b/eng/build/Workers.Python.props index 3bac42a81d..b4a66acf85 100644 --- a/eng/build/Workers.Python.props +++ b/eng/build/Workers.Python.props @@ -2,7 +2,7 @@ - + diff --git a/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj b/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj index 8aba112cd7..40426327b9 100644 --- a/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj +++ b/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj @@ -9,9 +9,17 @@ - + + + + - \ No newline at end of file + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 3fb289897c..11c84639e4 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,5 @@ - + diff --git a/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj b/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj index ba7aa18983..cf48bb6c8f 100644 --- a/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj +++ b/src/WebJobs.Script.Abstractions/WebJobs.Script.Abstractions.csproj @@ -7,14 +7,8 @@ - - - - - - - - + + diff --git a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj index cb059eea7b..ac96bb3cd3 100644 --- a/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj +++ b/src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj @@ -8,16 +8,8 @@ - - - - - - - - - - + + @@ -25,7 +17,10 @@ - + diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj index 7be370720c..6c913603b9 100644 --- a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj +++ b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj @@ -9,7 +9,6 @@ Microsoft.Azure.WebJobs.Script.WebHost InProcess false - 6.35.0 dc316708-c8c1-4ef1-90b3-19eb512d96f3 @@ -50,39 +49,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj index 2117fb7ad7..a457fc9fb8 100644 --- a/src/WebJobs.Script/WebJobs.Script.csproj +++ b/src/WebJobs.Script/WebJobs.Script.csproj @@ -25,55 +25,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 5a51d9d45b..5bfdf89157 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -1,7 +1,6 @@ - + diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props new file mode 100644 index 0000000000..c9fe719c6b --- /dev/null +++ b/test/Directory.Packages.props @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Resources/Directory.Packages.props b/test/Resources/Directory.Packages.props new file mode 100644 index 0000000000..6314c05d1b --- /dev/null +++ b/test/Resources/Directory.Packages.props @@ -0,0 +1,16 @@ + + + + false + + + + \ No newline at end of file diff --git a/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj b/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj index e3651327a5..dd15d1d90f 100644 --- a/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj +++ b/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs index 37f0868ac2..a3be885428 100644 --- a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs +++ b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs @@ -17,7 +17,6 @@ using Microsoft.Azure.WebJobs.Script.Config; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using Microsoft.WindowsAzure.MobileServices; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; @@ -280,43 +279,6 @@ protected async Task GetEmptyContainer(string containerName) return container; } - protected async Task WaitForMobileTableRecordAsync(string tableName, string itemId, string textToMatch = null) - { - // We know the tests are using the default INameResolver and this setting. - var mobileAppUri = _nameResolver.Resolve("AzureWebJobs_TestMobileUri"); - var client = new MobileServiceClient(new Uri(mobileAppUri)); - JToken item = null; - var table = client.GetTable(tableName); - await TestHelpers.Await(() => - { - bool result = false; - try - { - item = Task.Run(() => table.LookupAsync(itemId)).Result; - if (textToMatch != null) - { - result = item["Text"].ToString() == textToMatch; - } - else - { - result = true; - } - } - catch (AggregateException aggEx) - { - var ex = (MobileServiceInvalidOperationException)aggEx.InnerException; - if (ex.Response.StatusCode != HttpStatusCode.NotFound) - { - throw; - } - } - - return result; - }); - - return item; - } - protected async Task WaitForDocumentAsync(string itemId, string textToMatch = null) { var docUri = UriFactory.CreateDocumentUri("ItemDb", "ItemCollection", itemId); diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj index f6e0e44623..1c1635720c 100644 --- a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj +++ b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj @@ -11,24 +11,14 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -62,4 +52,9 @@ + + + + + diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj index 03f6e9b02f..b205758f25 100644 --- a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj +++ b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj @@ -16,24 +16,16 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/tools/ExtensionsMetadataGenerator/Directory.Build.props b/tools/ExtensionsMetadataGenerator/Directory.Build.props index de78e9f418..a657d92f99 100644 --- a/tools/ExtensionsMetadataGenerator/Directory.Build.props +++ b/tools/ExtensionsMetadataGenerator/Directory.Build.props @@ -1,7 +1,6 @@ - + Azure Functions extensions metadata generator diff --git a/tools/ExtensionsMetadataGenerator/Directory.Packages.props b/tools/ExtensionsMetadataGenerator/Directory.Packages.props new file mode 100644 index 0000000000..db603cfc7d --- /dev/null +++ b/tools/ExtensionsMetadataGenerator/Directory.Packages.props @@ -0,0 +1,37 @@ + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator.Console/ExtensionsMetadataGenerator.Console.csproj b/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator.Console/ExtensionsMetadataGenerator.Console.csproj index 93eaa4b67e..381b79fd56 100644 --- a/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator.Console/ExtensionsMetadataGenerator.Console.csproj +++ b/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator.Console/ExtensionsMetadataGenerator.Console.csproj @@ -13,8 +13,7 @@ - - + diff --git a/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator/ExtensionsMetadataGenerator.csproj b/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator/ExtensionsMetadataGenerator.csproj index 5ad6c52801..10a33c500c 100644 --- a/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator/ExtensionsMetadataGenerator.csproj +++ b/tools/ExtensionsMetadataGenerator/src/ExtensionsMetadataGenerator/ExtensionsMetadataGenerator.csproj @@ -51,12 +51,12 @@ - - - + + - + - \ No newline at end of file + + diff --git a/tools/ExtensionsMetadataGenerator/test/ExtensionsMetadataGeneratorTests/ExtensionsMetadataGeneratorTests.csproj b/tools/ExtensionsMetadataGenerator/test/ExtensionsMetadataGeneratorTests/ExtensionsMetadataGeneratorTests.csproj index c6fb984c5f..44ecbbc9a5 100644 --- a/tools/ExtensionsMetadataGenerator/test/ExtensionsMetadataGeneratorTests/ExtensionsMetadataGeneratorTests.csproj +++ b/tools/ExtensionsMetadataGenerator/test/ExtensionsMetadataGeneratorTests/ExtensionsMetadataGeneratorTests.csproj @@ -11,11 +11,11 @@ - - - - - + + + + + diff --git a/tools/ExtensionsMetadataGenerator/test/TestProject_Core21/TestProject_Core21.csproj b/tools/ExtensionsMetadataGenerator/test/TestProject_Core21/TestProject_Core21.csproj index cd547e23f0..2cfaa8c929 100644 --- a/tools/ExtensionsMetadataGenerator/test/TestProject_Core21/TestProject_Core21.csproj +++ b/tools/ExtensionsMetadataGenerator/test/TestProject_Core21/TestProject_Core21.csproj @@ -9,7 +9,7 @@ - + diff --git a/tools/ExtensionsMetadataGenerator/test/TestProject_Core22/TestProject_Core22.csproj b/tools/ExtensionsMetadataGenerator/test/TestProject_Core22/TestProject_Core22.csproj index 00d106ba0e..3d62e1d4c9 100644 --- a/tools/ExtensionsMetadataGenerator/test/TestProject_Core22/TestProject_Core22.csproj +++ b/tools/ExtensionsMetadataGenerator/test/TestProject_Core22/TestProject_Core22.csproj @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/tools/ExtensionsMetadataGenerator/test/TestProject_Razor/TestProject_Razor.csproj b/tools/ExtensionsMetadataGenerator/test/TestProject_Razor/TestProject_Razor.csproj index 2cf7b0842f..c69e4a095a 100644 --- a/tools/ExtensionsMetadataGenerator/test/TestProject_Razor/TestProject_Razor.csproj +++ b/tools/ExtensionsMetadataGenerator/test/TestProject_Razor/TestProject_Razor.csproj @@ -5,8 +5,8 @@ - - + +