Azure
/
azure-functions-core-tools
зеркало из https://github.com/Azure/azure-functions-core-tools.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

cleaning up nuget configs (#2605)

This commit is contained in:
Brett Samblanet 2021-05-26 10:10:11 -07:00 коммит произвёл GitHub
Родитель a2291d4942
Коммит 5ed0d4493e
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
7 изменённых файлов: 10 добавлений и 52 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
.nuget/NuGet.Config
Просмотреть файл

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
<add key="azure_app_service_staging" value="https://www.myget.org/F/azure-appservice-staging/api/v2" />
<add key="azure_app_service" value="https://www.myget.org/F/azure-appservice/api/v2" />
<add key="java_worker" value="https://ci.appveyor.com/NuGet/azure-functions-java-worker-fejnnsvmrkqg" />
<add key="powershell_worker" value="https://ci.appveyor.com/nuget/azure-functions-powershell-wor-0842fakagqy6" />
<add key="node_worker" value="https://ci.appveyor.com/nuget/azure-functions-nodejs-worker-0fcvx371y52p" />
<add key="webhost" value="https://ci.appveyor.com/NuGet/azure-webjobs-sdk-script-g6rygw981l9t" />
<add key="fuse_labs" value="https://www.myget.org/F/fusemandistfeed/api/v2" />
<add key="buildTools" value="https://www.myget.org/F/30de4ee06dd54956a82013fa17a3accb/" />
<add key="xunit_myget" value="https://www.myget.org/F/xunit/api/v3/index.json" />
</packageSources>
</configuration>

5
.nuget/packages.config
Просмотреть файл

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Web.SkipStrongNames" version="1.0.0" />
<package id="xunit.MSBuild" version="2.0.0" />
</packages>

6
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}"

10
NuGet.Config
Просмотреть файл

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
<add key="azure_app_service" value="https://www.myget.org/F/azure-appservice/api/v2" />
<add key="azure_app_service_staging" value="https://www.myget.org/F/azure-appservice-staging/api/v2" />
<add key="fuse_labs" value="https://www.myget.org/F/fusemandistfeed/api/v2" />
<add key="buildTools" value="https://www.myget.org/F/30de4ee06dd54956a82013fa17a3accb/" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="azure_app_service" value="https://www.myget.org/F/azure-appservice/api/v3/index.json" />
<add key="azure_app_service_staging" value="https://www.myget.org/F/azure-appservice-staging/api/v3/index.json" />
<add key="Microsoft.Azure.Functions.PowerShellWorker" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/Microsoft.Azure.Functions.PowerShellWorker/nuget/v3/index.json" />
<add key="AzureFunctions" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctions/nuget/v3/index.json" />
<add key="AzureFunctionsPreRelease" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsPreRelease/nuget/v3/index.json" />
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
</packageSources>
</configuration>

18
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()

6
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";

2
test/Azure.Functions.Cli.Tests/Azure.Functions.Cli.Tests.csproj
Просмотреть файл

@ -39,7 +39,7 @@
</ItemGroup>
<ItemGroup>
<None Include="..\..\.nuget\NuGet.Config" Link="NuGet.Config">
<None Include="..\..\NuGet.Config" Link="NuGet.Config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>