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

[release/7.0.1xx] Update dependencies from dotnet/arcade (#15822)

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This commit is contained in:
dotnet-maestro[bot] 2023-03-15 17:35:50 +00:00 committed by GitHub
parent 9f7fb0a5f3
commit cb88897531
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
NuGet.config
View file

@ -7,24 +7,30 @@
<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-e56abc4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-e56abc4-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-e56abc45-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ba16583" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-4/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-3/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ba16583-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ba16583f-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-2eac915" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2eac9157/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0a396ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-8c1421b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-8c1421b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-8c1421b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-8c1421b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8c1421b5-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-27813f8d-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.-->
@ -47,16 +53,19 @@
<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-e56abc4-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-e56abc4" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-0a396ac" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-8c1421b-1" value="true" />
<add key="darc-int-dotnet-sdk-8c1421b-2" value="true" />
<add key="darc-int-dotnet-sdk-8c1421b-3" value="true" />
<add key="darc-int-dotnet-sdk-8c1421b" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-27813f8-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8-4" value="true" />
<add key="darc-int-dotnet-windowsdesktop-27813f8" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->

12
eng/Version.Details.xml
View file

@ -194,18 +194,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.23164.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.23164.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.23164.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</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>

6
eng/Versions.props
View file

@ -33,7 +33,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
@ -122,8 +122,8 @@
We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case.
Instead the indicator is that the incoming SDK version is not RTM or greater yet.
-->
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) >= 2">true</SubtractOneFromTemplateVersions>
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) >= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
<SubtractOneFromTemplateVersions Condition="$([MSBuild]::Subtract($(VersionFeature), $(MicrosoftNETSdkPatchVersion))) &gt;= 2">true</SubtractOneFromTemplateVersions>
<SubtractOneFromTemplateVersions Condition="$(VersionFeature) &gt;= 1 AND ! $(MicrosoftNETSdkPackageVersion.Contains('rtm')) AND ! $(MicrosoftNETSdkPackageVersion.Contains('servicing'))">true</SubtractOneFromTemplateVersions>
<AspNetCoreTemplateFeature60>$([MSBuild]::Subtract($(VersionFeature60), 1))</AspNetCoreTemplateFeature60>
<AspNetCoreTemplateFeature60 Condition="'$(SubtractOneFromTemplateVersions)' == 'true'">$([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1))</AspNetCoreTemplateFeature60>
</PropertyGroup>

6
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "7.0.103",
"dotnet": "7.0.104",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23114.3"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23164.3"
}
}