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

[release/7.0.2xx] Update dependencies from dotnet/sdk (#15256)

Browse source
This commit is contained in:
Marc Paine 2023-01-17 16:37:28 -08:00 • committed by GitHub
commit f4982059b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.vsts-ci.yml
View file

@ -334,10 +334,11 @@ stages:
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
parameters:
dependsOn: Source_Build_Create_Tarball
# For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches.
# - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
# - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
# parameters:
# dependsOn: Source_Build_Create_Tarball
# https://github.com/dotnet/core-sdk/issues/248
# - template: /eng/build.yml

32
eng/Version.Details.xml
View file

@ -98,22 +98,22 @@
<Sha>bb3695688177f5f80eeb3c0498168612e31549d5</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.200-preview.23060.2">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.200-preview.23063.9">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>3605277a9324189c35b0da271e10a2386d6f6d06</Sha>
<Sha>9acbc4db3fa18e9839189580622be7258f81c9d5</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.23060.2">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.23063.9">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>3605277a9324189c35b0da271e10a2386d6f6d06</Sha>
<Sha>9acbc4db3fa18e9839189580622be7258f81c9d5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.23060.2">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.23063.9">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>3605277a9324189c35b0da271e10a2386d6f6d06</Sha>
<Sha>9acbc4db3fa18e9839189580622be7258f81c9d5</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.23060.2">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.23063.9">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>3605277a9324189c35b0da271e10a2386d6f6d06</Sha>
<Sha>9acbc4db3fa18e9839189580622be7258f81c9d5</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.2-servicing.22606.8" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -124,13 +124,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>df04c57b2e2bb986f0afc2384cbebb3c950447b5</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23059.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23062.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>1607c540c369f9ae32a48dd72e7952148b084a2a</Sha>
<Sha>9abb456f29f254da028126cb09ad10751a01eebf</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.23059.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.23062.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>1607c540c369f9ae32a48dd72e7952148b084a2a</Sha>
<Sha>9abb456f29f254da028126cb09ad10751a01eebf</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-release-20221220-01" CoherentParentDependency="Microsoft.NET.Sdk">
@ -138,9 +138,9 @@
<Sha>be79eb4393631df7c6431ed1c0aa14c1bbaca731</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22579.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.23062.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>8db10f44053ed4cb95a99676ac7b8ccae681b79d</Sha>
<Sha>19fa656d35252ccf926e6a6d783b16a2f094aaef</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
@ -149,9 +149,9 @@
<Sha>8ad2e6240cb7426d83f1b45241f8f33bddf3d474</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-23059-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-23061-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>ab3d68e815ba13916d6d3a653445d71ad238c723</Sha>
<Sha>040e2a90ee794997fc9716487280a54b0ad8fe2a</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.5.0-preview.3.136" CoherentParentDependency="Microsoft.NET.Sdk">

6
eng/Versions.props
View file

@ -63,9 +63,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200-preview.23060.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.200-preview.23060.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.23060.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200-preview.23063.9</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.200-preview.23063.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.23063.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

2
src/SourceBuild/tarball/content/global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "7.0.100"
"dotnet": "7.0.102"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",