Merge in 'release/7.0.2xx' changes
This commit is contained in:
dotnet-bot
commit
c13a39ea98
4 changed files with 24 additions and 13 deletions
17
NuGet.config
17
NuGet.config
|
|
@ -8,20 +8,24 @@
|
|||
<!--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-febee99" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-febee99d/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-febee99-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-febee99d-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-febee99-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-febee99d-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<add key="darc-pub-dotnet-emsdk-67006e8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-67006e8f/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-67006e8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-67006e8f-2/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-67006e8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-67006e8f-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-0a2bda1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-0a2bda1-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a2bda10-3/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-fc6a47e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-fc6a47e3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-fc6a47e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-fc6a47e3-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-sdk-fc6a47e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-fc6a47e3-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254-4/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0e619254-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
|
|
@ -45,16 +49,23 @@
|
|||
<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-febee99-1" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-febee99-2" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-febee99" value="true" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-0a2bda1-3" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-0a2bda1" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-sdk -->
|
||||
<add key="darc-int-dotnet-sdk-fc6a47e-1" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-fc6a47e-2" value="true" />
|
||||
<add key="darc-int-dotnet-sdk-fc6a47e" value="true" />
|
||||
<!-- End: Package sources from dotnet-sdk -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925-3" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925-4" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-0e61925" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
|
|
|
|||
|
|
@ -194,18 +194,18 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23108.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23114.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5eac3ace1b09862bd7421ba55795cc2a9c6a57d5</Sha>
|
||||
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23108.1">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23114.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5eac3ace1b09862bd7421ba55795cc2a9c6a57d5</Sha>
|
||||
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23108.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23114.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>5eac3ace1b09862bd7421ba55795cc2a9c6a57d5</Sha>
|
||||
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23063.1">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23108.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "7.0.102",
|
||||
"dotnet": "7.0.103",
|
||||
"runtimes": {
|
||||
"dotnet": [
|
||||
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.16.4"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23108.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23108.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue