mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[release/6.0.1xx] Update dependencies from dotnet/arcade (#18690)

Browse source
This commit is contained in:
Marc Paine 2024-02-15 13:11:35 -08:00 committed by GitHub
commit da8be456a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
NuGet.config
View file

@ -7,21 +7,28 @@
<clear />
<!--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-417d650" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-417d6500/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-a9f209f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a9f209f8/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-a9f209f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a9f209f8-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-a9f209f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a9f209f8-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-80de56d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80de56da/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80de56d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80de56da-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-80de56d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80de56da-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-01f9cb6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-01f9cb6e/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-01f9cb6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-01f9cb6e-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-01f9cb6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-01f9cb6e-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-752aa75" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-752aa75c/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-752aa75-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-752aa75c-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-752aa75-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-752aa75c-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" />
@ -42,16 +49,21 @@
<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-417d650" 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-80de56d-1" value="true" />
<add key="darc-int-dotnet-runtime-80de56d-2" value="true" />
<add key="darc-int-dotnet-runtime-80de56d" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-01f9cb6-1" value="true" />
<add key="darc-int-dotnet-templating-01f9cb6-2" value="true" />
<add key="darc-int-dotnet-templating-01f9cb6" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-752aa75-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-752aa75-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-752aa75" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->

12
eng/Version.Details.xml
View file

@ -197,19 +197,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24059.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24113.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24059.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.24113.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24059.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24113.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2</Sha>
<Sha>96facbceaca1e4eb498055c005088764d3b38dff</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22570.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -19,7 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.24059.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.24113.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
eng/common/templates/jobs/jobs.yml
View file

@ -88,8 +88,8 @@ jobs:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
runAsPublic: ${{ parameters.runAsPublic }}

4
eng/common/templates/post-build/post-build.yml
View file

@ -253,8 +253,8 @@ stages:
name: VSEngSS-MicroBuild2022-1ES
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Svc-Internal
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24059.3"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24113.1"
}
}