Merge in 'release/7.0.4xx' changes
This commit is contained in:
dotnet-bot
commit
ef5386847b
4 changed files with 9 additions and 45 deletions
36
NuGet.config
36
NuGet.config
|
|
@ -10,32 +10,14 @@
|
|||
<add key="darc-pub-DotNet-msbuild-Trusted-8ec440e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8ec440e6/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49-5/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49-4/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-57512b49-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-975080f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-975080f3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-975080f-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-975080f3-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-975080f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-975080f3-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-975080f-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-975080f3-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-7/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-6/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-5/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-4/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-018db428-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
|
||||
|
|
@ -57,29 +39,11 @@
|
|||
<disabledPackageSources>
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-aspnetcore -->
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-1" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-2" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-3" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-4" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4-5" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-57512b4" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-975080f-1" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-975080f-2" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-975080f-3" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-975080f" value="true" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-3" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-4" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-5" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-6" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42-7" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-018db42" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
|
|
|
|||
|
|
@ -192,18 +192,18 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23511.9">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23513.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
|
||||
<Sha>49ef9b336412d5bce043d4935166d8125a2e097d</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23511.9">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23513.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
|
||||
<Sha>49ef9b336412d5bce043d4935166d8125a2e097d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23511.9">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23513.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>acb831a5b31a3cc4a744a8944b6bd172e6969234</Sha>
|
||||
<Sha>49ef9b336412d5bce043d4935166d8125a2e097d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23219.1">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23511.9</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23513.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.16.4"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23513.2",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23513.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue