Skip to content

Commit 432c7b3

Browse files
authored
Merge branch 'main' into dev/jela/hr-update
2 parents f8ef400 + c633af9 commit 432c7b3

File tree

369 files changed

+8904
-4542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

369 files changed

+8904
-4542
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ cmake/
4242

4343
# MSBuild Logs
4444
**/MSBuild_Logs/MSBuild_pid-*.failure.txt
45+
46+
# Test results
47+
**/*.trx

Directory.Build.targets

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
4747
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
4848
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
49-
and '$(MSBuildProjectName)' != 'toolset-tasks'">
49+
and '$(MSBuildProjectName)' != 'toolset-tasks'
50+
and '$(MSBuildProjectName)' != 'core-sdk-tasks'">
5051
<FrameworkReference
5152
Update="Microsoft.NETCore.App"
5253
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"

Directory.Packages.props

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
4545
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)"/>
4646
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
47+
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
4748
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
4849
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
4950
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
@@ -99,6 +100,7 @@
99100
<PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)"/>
100101
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)"/>
101102
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
103+
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
102104
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
103105
<!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->
104106
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />

NuGet.config

+12
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1414
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1515
<!-- Begin: Package sources from dotnet-runtime -->
16+
<add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-runtime-e77011b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-5/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-runtime-e77011b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-2/nuget/v3/index.json" />
20+
<add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
1621
<!-- End: Package sources from dotnet-runtime -->
1722
<!-- Begin: Package sources from dotnet-templating -->
1823
<!-- End: Package sources from dotnet-templating -->
@@ -28,6 +33,8 @@
2833
<add key="dotnet8-workloads" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-workloads/nuget/v3/index.json" />
2934
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
3035
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
36+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
37+
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
3138
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
3239
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
3340
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -45,6 +52,11 @@
4552
<!-- Begin: Package sources from dotnet-aspnetcore -->
4653
<!-- End: Package sources from dotnet-aspnetcore -->
4754
<!-- Begin: Package sources from dotnet-runtime -->
55+
<add key="darc-int-dotnet-runtime-e77011b-1" value="true" />
56+
<add key="darc-int-dotnet-runtime-e77011b-2" value="true" />
57+
<add key="darc-int-dotnet-runtime-e77011b-3" value="true" />
58+
<add key="darc-int-dotnet-runtime-e77011b-5" value="true" />
59+
<add key="darc-int-dotnet-runtime-e77011b" value="true" />
4860
<!-- End: Package sources from dotnet-runtime -->
4961
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5062
<!-- End: Package sources from dotnet-windowsdesktop -->

build/RunTestsOnHelix.cmd

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\d
99
set PATH=%DOTNET_ROOT%;%PATH%
1010
set DOTNET_MULTILEVEL_LOOKUP=0
1111
set TestFullMSBuild=%1
12+
set BuildWithNetFrameworkHostedCompiler=false
1213

1314
set TestExecutionDirectory=%CD%\testExecutionDirectory
1415
mkdir %TestExecutionDirectory%
@@ -48,4 +49,4 @@ dotnet nuget remove source dotnet-libraries-transport --configfile %TestExecutio
4849
dotnet nuget remove source dotnet-tools-transport --configfile %TestExecutionDirectory%\nuget.config
4950
dotnet nuget remove source dotnet-libraries --configfile %TestExecutionDirectory%\nuget.config
5051
dotnet nuget remove source dotnet-eng --configfile %TestExecutionDirectory%\nuget.config
51-
dotnet nuget list source --configfile %TestExecutionDirectory%\nuget.config
52+
dotnet nuget list source --configfile %TestExecutionDirectory%\nuget.config

0 commit comments

Comments
 (0)