Skip to content

Commit

Permalink
Merge branch 'main' of github.com:dotnet/runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
RobertHenry6bev committed Sep 9, 2022
2 parents a67d4a8 + 071fe7c commit 2bf66eb
Show file tree
Hide file tree
Showing 290 changed files with 4,716 additions and 3,024 deletions.
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,77 +54,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22452.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22451.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -242,9 +242,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>919daad8a314e5b0e16f15db62352c367a306c85</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22452.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22455.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>87531ff8de2e6501ff85973c9af44953a2c5b687</Sha>
<Sha>fca51250390d403827cf50c0df9dbc632514b739</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
34 changes: 17 additions & 17 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,27 @@
<!--
TODO: Remove pinned version once arcade supplies a compiler that enables the repo to compile.
-->
<MicrosoftNetCompilersToolsetVersion>4.4.0-2.22412.11</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetVersion>4.4.0-3.22452.8</MicrosoftNetCompilersToolsetVersion>
<StaticCsVersion>0.2.0</StaticCsVersion>
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>7.0.100-rc.1.22402.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22452.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22452.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22452.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22452.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22452.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22452.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22452.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22452.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22452.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22452.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22452.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22452.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22452.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22452.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22452.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22452.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22455.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22455.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22455.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22455.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22455.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22455.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22455.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22455.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22455.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22455.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22455.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22455.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22455.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22455.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22455.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22455.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
5 changes: 5 additions & 0 deletions eng/liveBuilds.targets
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,11 @@
$(LibrariesNativeArtifactsPath)dotnet.timezones.blat;
$(LibrariesNativeArtifactsPath)*.dat;"
IsNative="true" />
<!-- for threaded wasm -->
<LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'Browser' and Exists('$(LibrariesNativeArtifactsPath)dotnet.worker.js')"
Include="
$(LibrariesNativeArtifactsPath)dotnet.worker.js"
IsNative="true" />
<LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'Browser'"
Include="
$(LibrariesNativeArtifactsPath)src\*.c;
Expand Down
26 changes: 26 additions & 0 deletions eng/pipelines/common/evaluate-default-paths.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ jobs:
- eng/testing/scenarios/BuildWasmAppsJobsList.txt
- eng/testing/workloads-testing.targets
- src/libraries/sendtohelix*
- src/libraries/System.Net.WebSockets.Client/*
- src/libraries/System.Runtime.InteropServices/*
- src/libraries/System.Runtime.InteropServices.JavaScript/*
- src/mono/mono/*
- src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/*
- src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/*
Expand All @@ -159,6 +162,8 @@ jobs:
- subset: wasmdebuggertests
include:
- eng/testing/ProvisioningVersions.props
- src/libraries/System.Runtime.InteropServices/*
- src/libraries/System.Runtime.InteropServices.JavaScript/*
- src/mono/mono/*
- src/mono/wasm/debugger/*
- src/mono/wasm/runtime/*
Expand All @@ -179,6 +184,27 @@ jobs:
# other paths that should also trigger wasm jobs
- src/mono/*

# libraries with some wasm specific code
- subset: wasm_libraries
include:
- src/libraries/Common/*
- src/libraries/System.Console/*
- src/libraries/System.Diagnostics.FileVersionInfo/tests/*
- src/libraries/System.IO.Compression/*
- src/libraries/System.IO.MemoryMappedFiles/*
- src/libraries/System.Net.Http/*
- src/libraries/System.Net.Mail/*
- src/libraries/System.Net.Primitives/*
- src/libraries/System.Net.WebClient/*
- src/libraries/System.Net.WebProxy/*
- src/libraries/System.Net.WebSockets.Client/*
- src/libraries/System.Net.WebSockets/*
- src/libraries/System.Runtime.InteropServices.JavaScript/*
- src/libraries/System.Runtime.InteropServices/*
- src/libraries/System.Runtime.Serialization.Formatters/*
- src/libraries/System.Security.Cryptography/*
- src/libraries/System.Text.Encodings.Web/*

# anything other than wasm-specific paths
- subset: non_wasm
exclude:
Expand Down
Loading

0 comments on commit 2bf66eb

Please sign in to comment.