Skip to content

[release/7.0] Update dependencies from dotnet/arcade #83467

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

Merged
carlossanlop merged 4 commits into from
Mar 15, 2023
Merged

[release/7.0] Update dependencies from dotnet/arcade #83467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0720bb8
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Mar 15, 2023
98f15fd
Supress architecture mismatch warning for CoreLib
carlossanlop Mar 15, 2023
3d4a693
Suppress arch mismatch warnings in interop tests.
carlossanlop Mar 15, 2023
d9a0d34
Fix host tests
elinor-fung Feb 28, 2023
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
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,77 +58,77 @@
</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>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.Helix.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.ApiCompat" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" 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.GenAPI" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.GenAPI" 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.GenFacades" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.GenFacades" 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.XUnitExtensions" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" 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.XUnitConsoleRunner" Version="2.5.1-beta.23114.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23164.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" 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.Packaging" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" 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.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" 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.Workloads" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" 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.CodeAnalysis" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" 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.TargetFramework" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" 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.RemoteExecutor" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" 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.Feed" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" 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.VersionTools.Tasks" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" 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.SharedFramework.Sdk" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.23164.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.23151.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -258,9 +258,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>5ebf69650b9f7b4ecab485be840b3022420f7812</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23114.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.23164.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4625a29565a94d3b8c5c680c8f1f1d53b2f216f5</Sha>
<Sha>099bbb071e187ba4e1603004597624e6acae6394</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23114.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23114.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23114.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23114.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23114.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23114.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23114.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23114.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23114.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.23164.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.23164.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.23164.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.23164.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.23164.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23164.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.23164.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.23164.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23164.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.23164.3</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
6 changes: 4 additions & 2 deletions eng/resolveContract.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,16 @@
AfterTargets="ResolveProjectReferences"
BeforeTargets="FindReferenceAssembliesForReferences"
Condition="'@(ProjectReference)' != '' and '@(_ResolvedProjectReferencePaths)' != ''">
<!-- If we have a ProjectReference to CoreLib, we need to compile against implementation assemblies. -->
<!-- If we have a ProjectReference to CoreLib, we need to compile against implementation assemblies,
and ignore architecture mismatches in those implementation assemblies. -->
<PropertyGroup Condition="@(_ResolvedProjectReferencePaths->AnyHaveMetadataValue('MSBuildSourceProjectFile', '$(CoreLibProject)'))">
<CompileUsingReferenceAssemblies Condition="'$(CompileUsingReferenceAssemblies)' == ''">false</CompileUsingReferenceAssemblies>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
</PropertyGroup>
<!-- Clear the ReferenceAssembly attribute on resolved P2Ps that set SkipUseReferenceAssembly to true. -->
<ItemGroup>
<_resolvedP2PFiltered Include="@(ProjectReference)"
ProjectReferenceItemSpec="$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)'))"
ProjectReferenceItemSpec="$([System.IO.Path]::GetFullPath('%(ProjectReference.Identity)'))"
SkipUseReferenceAssembly="%(ProjectReference.SkipUseReferenceAssembly)" />
<_ResolvedProjectReferencePaths Condition="'%(_resolvedP2PFiltered.ProjectReferenceItemSpec)' == '%(_resolvedP2PFiltered.MSBuildSourceProjectFile)' and
'%(_resolvedP2PFiltered.SkipUseReferenceAssembly)' == 'true'"
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "7.0.103",
"version": "7.0.104",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "7.0.103"
"dotnet": "7.0.104"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23114.3",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23114.3",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23164.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23164.3",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.23164.3",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"
Expand Down
1 change: 1 addition & 0 deletions src/installer/tests/Assets/TestProjects/PortableApp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public static void Main(string[] args)

// A small operation involving NewtonSoft.Json to ensure the assembly is loaded properly
var t = typeof(Newtonsoft.Json.JsonReader);
System.Diagnostics.Trace.WriteLine(t);
}
}
}
1 change: 1 addition & 0 deletions ...nstaller/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ public static void Initialize()

// A small operation involving NewtonSoft.Json to ensure the assembly is loaded properly
var t = typeof(Newtonsoft.Json.JsonReader);
System.Diagnostics.Trace.WriteLine(t);
}
}
3 changes: 2 additions & 1 deletion ...me.InteropServices/tests/LibraryImportGenerator.Tests/LibraryImportGenerator.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
<IncludeLibraryImportGeneratorSources>false</IncludeLibraryImportGeneratorSources>
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
</PropertyGroup>

<ItemGroup>
<Compile Include="$(CommonPath)DisableRuntimeMarshalling.cs"
Link="Common\DisableRuntimeMarshalling.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Ancillary.Interop\Ancillary.Interop.csproj" />
<ProjectReference Include="..\TestAssets\NativeExports\NativeExports.csproj" />
Expand Down