Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@

<PropertyGroup>
<DotNetHostBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(TargetRid).$(HostConfiguration)', 'corehost'))</DotNetHostBinDir>
<DotNetCdacBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mscordaccore_universal', '$(Configuration)', '$(NetCoreAppCurrent)', '$(TargetRid)', 'publish'))</DotNetCdacBinDir>
<DotNetCdacBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'mscordaccore_universal', '$(Configuration)', '$(NetCoreAppCurrent)', '$(PortableTargetRid)', 'publish'))</DotNetCdacBinDir>
</PropertyGroup>

<!--Feature switches -->
Expand Down
2 changes: 2 additions & 0 deletions eng/Subsets.props
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,8 @@
<_BuildMonoRuntimePack Condition="'$(RuntimeFlavor)' == 'Mono' and '$(MonoSupported)' == 'true'">true</_BuildMonoRuntimePack>
<_BuildHostPack Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildHostPack>
<_BuildCdacPack Condition="'$(_CDacToolsBuilt)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR' and '$(TargetsMobile)' != 'true' and ('$(TargetOS)' == 'windows' or '$(TargetOS)' == 'osx' or '$(TargetOS)' == 'linux')">true</_BuildCdacPack>
<!-- Some source build configurations and musl need to work out packaging errors before they can be enabled -->
<_BuildCdacPack Condition="'$(DotNetBuildSourceOnly)' == 'true' or '$(TargetsLinuxMusl)' == 'true'">false</_BuildCdacPack>
<_BuildBundle Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)' and '$(TargetsMobile)' != 'true'">true</_BuildBundle>
</PropertyGroup>

Expand Down
142 changes: 71 additions & 71 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="86117ef4343bab700dab871c416e55b22848cd52" BarId="274788" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="runtime" Sha="f65cc9c656ea330c50ed30694c4b0834489f7f6d" BarId="275021" />
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="10.0.0-preview.6.25302.1">
<Uri>https://github.com/dotnet/icu</Uri>
Expand Down Expand Up @@ -41,91 +41,91 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>da5dd054a531e6fea65643b7e754285b73eab433</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta6.25360.101">
<Dependency Name="System.CommandLine" Version="2.0.0-beta7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25360.101">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.100-preview.7.25360.101">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.100-preview.7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.3-beta.25360.101">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.3-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.3-beta.25360.101">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.3-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25310.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -263,33 +263,33 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>da5dd054a531e6fea65643b7e754285b73eab433</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25360.101">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="runtime.native.System.IO.Ports" Version="10.0.0-preview.7.25360.101">
<Dependency Name="runtime.native.System.IO.Ports" Version="10.0.0-preview.7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25360.101">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-preview.7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.7.25360.101">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="10.0.0-preview.7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25360.101">
<Dependency Name="System.Text.Json" Version="10.0.0-preview.7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="10.0.0-preview.7.25360.101">
<Dependency Name="System.Reflection.Metadata" Version="10.0.0-preview.7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25360.101">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="10.0.0-prerelease.25330.2">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand All @@ -303,9 +303,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>feac80219b22c403d32df9b6bd61cbf78e1b9986</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25360.101">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand All @@ -331,29 +331,29 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>385d085eb055cabeaed3dde958a900e7b31cf6ce</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25360.101">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25360.101">
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25360.101">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25360.101">
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25360.101">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.0-preview.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.7.25360.101">
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.7.25362.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>86117ef4343bab700dab871c416e55b22848cd52</Sha>
<Sha>f65cc9c656ea330c50ed30694c4b0834489f7f6d</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
Loading
Loading