Skip to content

[release/7.0.2xx] Update dependencies from dotnet/sdk #15078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 23 commits into from
Closed

[release/7.0.2xx] Update dependencies from dotnet/sdk #15078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fb7f875
Update dependencies from https://github.com/dotnet/sdk build 20221201.6
dotnet-maestro[bot] Dec 1, 2022
e8222b0
Update dependencies from https://github.com/dotnet/sdk build 20221201.11
dotnet-maestro[bot] Dec 1, 2022
2ce4677
Update dependencies from https://github.com/dotnet/sdk build 20221201.22
dotnet-maestro[bot] Dec 1, 2022
6061b9e
Update dependencies from https://github.com/dotnet/sdk build 20221201.38
dotnet-maestro[bot] Dec 2, 2022
0a8d6bc
Update dependencies from https://github.com/dotnet/sdk build 20221201.40
dotnet-maestro[bot] Dec 2, 2022
bfce8b6
Update dependencies from https://github.com/dotnet/sdk build 20221202.5
dotnet-maestro[bot] Dec 2, 2022
e46f7b9
Update dependencies from https://github.com/dotnet/sdk build 20221202.6
dotnet-maestro[bot] Dec 2, 2022
6fe7e49
Update dependencies from https://github.com/dotnet/sdk build 20221205.7
dotnet-maestro[bot] Dec 6, 2022
2e1ef81
Update dependencies from https://github.com/dotnet/sdk build 20221205.11
dotnet-maestro[bot] Dec 6, 2022
1b60db5
Update dependencies from https://github.com/dotnet/sdk build 20221206.1
dotnet-maestro[bot] Dec 6, 2022
b927bf4
Update dependencies from https://github.com/dotnet/sdk build 20221206.6
dotnet-maestro[bot] Dec 6, 2022
736ffa3
Update dependencies from https://github.com/dotnet/sdk build 20221206.9
dotnet-maestro[bot] Dec 6, 2022
3ed1ec2
Update dependencies from https://github.com/dotnet/sdk build 20221207.6
dotnet-maestro[bot] Dec 7, 2022
a3a6fb8
Update dependencies from https://github.com/dotnet/sdk build 20221207.8
dotnet-maestro[bot] Dec 7, 2022
ecb8830
Update dependencies from https://github.com/dotnet/sdk build 20221207.10
dotnet-maestro[bot] Dec 7, 2022
60d2ca1
Update dependencies from https://github.com/dotnet/sdk build 20221207.12
dotnet-maestro[bot] Dec 8, 2022
b6300fe
Update dependencies from https://github.com/dotnet/sdk build 20221207.18
dotnet-maestro[bot] Dec 8, 2022
c83d4fd
Update dependencies from https://github.com/dotnet/sdk build 20221208.6
dotnet-maestro[bot] Dec 8, 2022
9ae71b9
Update dependencies from https://github.com/dotnet/sdk build 20221208.8
dotnet-maestro[bot] Dec 8, 2022
5a132df
Update dependencies from https://github.com/dotnet/sdk build 20221208.10
dotnet-maestro[bot] Dec 9, 2022
a88b6d7
Update dependencies from https://github.com/dotnet/sdk build 20221209.2
dotnet-maestro[bot] Dec 9, 2022
586b74a
Add vstest source-build patch
MichaelSimons Dec 9, 2022
4f813b0
Merge branch 'darc-release/7.0.2xx-b09871e1-4455-4b2f-a5fe-a12a074510…
MichaelSimons Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.22580.54">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.200-preview.22609.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>2de3de4d26d207246c571ac1e6f5b7d70904204c</Sha>
<Sha>1fd76f45a08686e18b18607646fe37db60abcaca</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.22580.54">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.22609.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>2de3de4d26d207246c571ac1e6f5b7d70904204c</Sha>
<Sha>1fd76f45a08686e18b18607646fe37db60abcaca</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.22580.54">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.22609.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>2de3de4d26d207246c571ac1e6f5b7d70904204c</Sha>
<Sha>1fd76f45a08686e18b18607646fe37db60abcaca</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.22580.54">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.22609.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>2de3de4d26d207246c571ac1e6f5b7d70904204c</Sha>
<Sha>1fd76f45a08686e18b18607646fe37db60abcaca</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.0-rtm.22518.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand All @@ -124,18 +124,18 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>636e2b7a00a434a354a126f510a56e16ce3c6bbc</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.22580.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.22608.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>53f907e84e36a56e68e76fcc3aa5c12540363345</Sha>
<Sha>ae1718567f2aab20df7ca07368b9f51d1c376a10</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.22580.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.22608.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>53f907e84e36a56e68e76fcc3aa5c12540363345</Sha>
<Sha>ae1718567f2aab20df7ca07368b9f51d1c376a10</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221130-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221208-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>dbdb1f6f9007a288c904aa1f13485a3e57080fb6</Sha>
<Sha>3e2a581bc2c2154d5a603a48aa2a460fd87774fb</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22579.2" CoherentParentDependency="Microsoft.NET.Sdk">
Expand All @@ -144,19 +144,19 @@
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.22580.13" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.22608.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>ea0b6351c129c7decd9bf76f4388239509e28e0d</Sha>
<Sha>716366a3830293571eaaad9b1b2b3929b5216f42</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22580-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22608-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>ee6f71d15eea77c970815d9105ab9520876c5042</Sha>
<Sha>c81f58b45b97d3d0e547f48719322d55f00b5aa4</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.5.0-preview.2.104" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.5.0-preview.2.108" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>dfe13cc99d13de74f41e9cff35600a2c8958aac1</Sha>
<Sha>be87c9ee11149780ce7de5fe35fe2653d565ccfd</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200-preview.22580.54</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.200-preview.22580.54</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.22580.54</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200-preview.22609.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.200-preview.22609.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.22609.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down Expand Up @@ -171,7 +171,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.5.0-preview-20221130-01</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.5.0-preview-20221208-02</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- dependencies for source-build tarball -->
<PropertyGroup>
Expand Down
28 changes: 28 additions & 0 deletions src/SourceBuild/tarball/patches/vstest/0001-try-to-bump-only-in-case-of-source-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Marco Rossignoli <[email protected]>
Date: Fri, 9 Dec 2022 17:46:38 +0100
Subject: [PATCH] try to bump only in case of source build

Backport: https://github.com/microsoft/vstest/pull/4186
---
scripts/build/TestPlatform.Dependencies.props | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props
index c6a29db2..74945bd4 100644
--- a/scripts/build/TestPlatform.Dependencies.props
+++ b/scripts/build/TestPlatform.Dependencies.props
@@ -71,7 +71,12 @@
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>

<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0-preview4-27615-11</MicrosoftExtensionsDependencyModelPackageVersion>
- <MicrosoftExtensionsFileSystemGlobbingPackageVersion>1.1.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+
+ <!-- Looks like source build workflow changes the version used during the build but we're shipping older version, this lead to failure on "centos" -->
+ <!-- We have to keep the version aligned with the SDK version specified src\vstest.console\vstest.console.csproj <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">xxxx;</TargetFrameworks> -->
+ <!-- https://github.com/dotnet/installer/pull/15078#issuecomment-1344407280 -->
+ <MicrosoftExtensionsFileSystemGlobbingPackageVersion Condition=" '$(DotNetBuildFromSource)' == 'true' ">7.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+ <MicrosoftExtensionsFileSystemGlobbingPackageVersion Condition=" '$(DotNetBuildFromSource)' == '' ">1.1.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>

<CoverletCoverageVersion>1.2.0</CoverletCoverageVersion>
<RoslynPublicApiAnalyzersVersion>3.3.4-beta1.21554.2</RoslynPublicApiAnalyzersVersion>