Merge commit '329046d029'
This commit is contained in:
Mirroring
commit
e73a17a965
4 changed files with 33 additions and 10 deletions
23
NuGet.config
23
NuGet.config
|
|
@ -8,21 +8,34 @@
|
|||
<!--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-827b960" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-827b960-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-827b960-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-aspnetcore-827b960-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<add key="darc-pub-dotnet-emsdk-c68eace" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-c68eace-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-3/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-c68eace-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-2/nuget/v3/index.json" />
|
||||
<add key="darc-pub-dotnet-emsdk-c68eace-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c68eace1-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<add key="darc-pub-DotNet-msbuild-Trusted-85d7107" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-85d71072/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-runtime-b357f86-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c-2/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-1e5db13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-1e5db13-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-1e5db13-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-templating-1e5db13-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134-1/nuget/v3/index.json" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-fc5b097-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978-3/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-fc5b097-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978-2/nuget/v3/index.json" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-fc5b097-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978-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" />
|
||||
|
|
@ -43,16 +56,26 @@
|
|||
<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-827b960-1" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-827b960-2" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-827b960-3" value="true" />
|
||||
<add key="darc-int-dotnet-aspnetcore-827b960" value="true" />
|
||||
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- End: Package sources from DotNet-msbuild-Trusted -->
|
||||
<!-- End: Package sources from dotnet-aspnetcore -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<add key="darc-int-dotnet-runtime-b357f86-2" value="true" />
|
||||
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
|
||||
<!-- Begin: Package sources from dotnet-templating -->
|
||||
<add key="darc-int-dotnet-templating-1e5db13-1" value="true" />
|
||||
<add key="darc-int-dotnet-templating-1e5db13-2" value="true" />
|
||||
<add key="darc-int-dotnet-templating-1e5db13-3" value="true" />
|
||||
<add key="darc-int-dotnet-templating-1e5db13" value="true" />
|
||||
<!-- End: Package sources from dotnet-templating -->
|
||||
<!-- Begin: Package sources from dotnet-windowsdesktop -->
|
||||
<add key="darc-int-dotnet-windowsdesktop-fc5b097-1" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-fc5b097-2" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-fc5b097-3" value="true" />
|
||||
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
|
||||
<!-- End: Package sources from dotnet-windowsdesktop -->
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
|
|
|
|||
|
|
@ -197,19 +197,19 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24463.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24508.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>51df77c8fcd7893066f14eab382ef95c5faed6cf</Sha>
|
||||
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24463.1">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24508.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>51df77c8fcd7893066f14eab382ef95c5faed6cf</Sha>
|
||||
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24463.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24508.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>51df77c8fcd7893066f14eab382ef95c5faed6cf</Sha>
|
||||
<Sha>bb06ac242cf3faf5cef64127bdd11c3a4f060c06</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.24266.3">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.24463.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.24508.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "6.0.133",
|
||||
"dotnet": "6.0.135",
|
||||
"runtimes": {
|
||||
"dotnet": [
|
||||
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.16.4"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24463.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24463.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24508.2",
|
||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24508.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue