diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
deleted file mode 100644
index 81a5cd37..00000000
--- a/.nuget/NuGet.Config
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.nuget/packages.config b/.nuget/packages.config
deleted file mode 100644
index 431ce01e..00000000
--- a/.nuget/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/Azure.Functions.Cli.sln b/Azure.Functions.Cli.sln
index edd2adfc..f4fe46ec 100644
--- a/Azure.Functions.Cli.sln
+++ b/Azure.Functions.Cli.sln
@@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29519.87
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CF86C17E-5C8A-4810-87BF-10548537A771}"
- ProjectSection(SolutionItems) = preProject
- .nuget\NuGet.Config = .nuget\NuGet.Config
- .nuget\packages.config = .nuget\packages.config
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5F51C958-39C0-4E0C-9165-71D0BCE647BC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EE1D011-2334-44F2-9D41-608B969DAE6D}"
diff --git a/NuGet.Config b/NuGet.Config
index 828a766a..61f48dcf 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,13 +1,11 @@
-
-
-
-
-
+
+
+
+
-
\ No newline at end of file
diff --git a/build/BuildSteps.cs b/build/BuildSteps.cs
index 31483fde..de2369c7 100644
--- a/build/BuildSteps.cs
+++ b/build/BuildSteps.cs
@@ -26,22 +26,8 @@ namespace Build
public static void RestorePackages()
{
- var feeds = new[]
- {
- "https://api.nuget.org/v3/index.json",
- "https://www.myget.org/F/azure-appservice/api/v3/index.json",
- "https://www.myget.org/F/azure-appservice-staging/api/v3/index.json",
- //"https://www.myget.org/F/fusemandistfeed/api/v2",
- //"https://www.myget.org/F/30de4ee06dd54956a82013fa17a3accb/",
- //"https://www.myget.org/F/xunit/api/v3/index.json",
- "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/Microsoft.Azure.Functions.PowerShellWorker/nuget/v3/index.json",
- "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsPreRelease/nuget/v3/index.json",
- "https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctions/nuget/v3/index.json",
- "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json"
- }
- .Aggregate(string.Empty, (a, b) => $"{a} --source {b}");
-
- Shell.Run("dotnet", $"restore {Settings.ProjectFile} {feeds}");
+ // This will use the sources from the nuget.config file in the repo root
+ Shell.Run("dotnet", $"restore");
}
public static void UpdatePackageVersionForIntegrationTests()
diff --git a/build/Settings.cs b/build/Settings.cs
index d425d57b..c7556dd4 100644
--- a/build/Settings.cs
+++ b/build/Settings.cs
@@ -37,9 +37,9 @@ namespace Build
public static readonly string DurableFolder = Path.Combine(TestProjectPath, "Resources", "DurableTestFolder");
- public static readonly string[] TargetRuntimes = new[] {
+ public static readonly string[] TargetRuntimes = new[] {
"min.win-x86",
- "min.win-x64",
+ "min.win-x64",
"linux-x64",
"osx-x64",
"win-x86",
@@ -130,7 +130,7 @@ namespace Build
public static readonly string ToAuthenticodeSign = "Authenticode";
public static readonly string ThirdParty = "Sign3rdParty";
public static readonly string ToThirdPartySign = "ThirdParty";
- public static readonly string[] RuntimesToSign = new string[] { /* temporarily skipped "min.win-x86", "min.win-x64" */ };
+ public static readonly string[] RuntimesToSign = new string[] { "min.win-x86", "min.win-x64" };
public static readonly string[] FilterExtenstionsSign = new[] { ".json", ".spec", ".cfg", ".pdb", ".config", ".nupkg", ".py", ".md" };
public static readonly string SigcheckDownloadURL = "https://functionsbay.blob.core.windows.net/public/tools/sigcheck64.exe";
diff --git a/test/Azure.Functions.Cli.Tests/Azure.Functions.Cli.Tests.csproj b/test/Azure.Functions.Cli.Tests/Azure.Functions.Cli.Tests.csproj
index 82c135bd..e539599a 100644
--- a/test/Azure.Functions.Cli.Tests/Azure.Functions.Cli.Tests.csproj
+++ b/test/Azure.Functions.Cli.Tests/Azure.Functions.Cli.Tests.csproj
@@ -39,7 +39,7 @@
-
+
Always