Remove extra nuget.config (#2636)

Unblock build by removing extra nuget.config and pointing ADO yml to the one at repo root.
Azure · Oct 12, 2023 · be03ba8 · be03ba8
1 parent 0e4cca1
commit be03ba8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 22 deletions.
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/WebJobs.Extensions.DurableTask.sln b/WebJobs.Extensions.DurableTask.sln
@@ -9,11 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7EC858EE-348
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{78BCF152-C22C-408F-9FB1-0F8C99B154B5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{51D8DCEA-EA91-410E-AA6A-F42473F0C691}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Extensions.DurableTask.Tests.V2", "test\FunctionsV2\WebJobs.Extensions.DurableTask.Tests.V2.csproj", "{F2A5DABB-36D4-4152-AF49-2570149899E1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Extensions.DurableTask.Tests.V1", "test\FunctionsV1\WebJobs.Extensions.DurableTask.Tests.V1.csproj", "{F99CA746-553C-43B4-943B-59A5D190459A}"
@@ -23,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		azure-pipelines-release-dotnet-isolated.yml = azure-pipelines-release-dotnet-isolated.yml
 		azure-pipelines-release.yml = azure-pipelines-release.yml
+		nuget.config = nuget.config
 		README.md = README.md
 		release_notes.md = release_notes.md
 		.stylecop\stylecop.json = .stylecop\stylecop.json

diff --git a/azure-pipelines-analyzer-release.yml b/azure-pipelines-analyzer-release.yml
@@ -38,7 +38,7 @@ steps:
     command: restore
     projects: '**/**/*.csproj'
     feedsToUse: config
-    nugetConfigPath: '.nuget/nuget.config'
+    nugetConfigPath: 'nuget.config'
 
 # Build durable-analyzer
 - task: VSBuild@1

diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
@@ -38,7 +38,7 @@ steps:
     command: restore
     projects: '**/**/*.csproj'
     feedsToUse: config
-    nugetConfigPath: '.nuget/nuget.config'
+    nugetConfigPath: 'nuget.config'
 
 # Build durable-extension
 - task: VSBuild@1

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -23,7 +23,7 @@ jobs:
         command: 'restore'
         projects: 'test/FunctionsV1/*.csproj'
         feedsToUse: 'config'
-        nugetConfigPath: '.nuget/nuget.config'
+        nugetConfigPath: 'nuget.config'
 
     - task: DotNetCoreCLI@2
       inputs:
@@ -72,7 +72,7 @@ jobs:
         command: 'restore'
         projects: 'test/FunctionsV2/*.csproj'
         feedsToUse: 'config'
-        nugetConfigPath: '.nuget/nuget.config'
+        nugetConfigPath: 'nuget.config'
 
     - task: DotNetCoreCLI@2
       inputs:
@@ -119,7 +119,7 @@ jobs:
         command: 'restore'
         projects: 'test/WebJobs.Extensions.DurableTask.Analyzers.Test/*.csproj'
         feedsToUse: 'config'
-        nugetConfigPath: '.nuget/nuget.config'
+        nugetConfigPath: 'nuget.config'
 
     - task: DotNetCoreCLI@2
       inputs:

diff --git a/test/SmokeTests/OOProcSmokeTests/DotNetIsolated/DotNetIsolated.csproj b/test/SmokeTests/OOProcSmokeTests/DotNetIsolated/DotNetIsolated.csproj
@@ -16,7 +16,7 @@
       This preview package is to enable better NuGet restore behavior with custom feeds.
       TODO: upgrade to 1.16.0 when it's released.
     -->
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.0-preview1" OutputItemType="Analyzer" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.16.0-preview2" OutputItemType="Analyzer" />
     <PackageReference Include="Microsoft.DurableTask.Generators" Version="1.0.0-preview.1" OutputItemType="Analyzer" />
   </ItemGroup>