Skip to content

Commit d25b956

Browse files
lewinglewing
committed
[runtime] Source update 896160e → 896160e
Diff: https://github.com/dotnet/dotnet/compare/896160ec9eb0fdb1c019f698b39fa0923c9a316c..896160ec9eb0fdb1c019f698b39fa0923c9a316c From: dotnet/dotnet@896160e To: dotnet/dotnet@896160e The following files had conflicts that were resolved by a user: - Directory.Build.targets
1 parent 16d22ef commit d25b956

File tree

5 files changed

+124
-132
lines changed

5 files changed

+124
-132
lines changed

‎Directory.Build.targets‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,6 @@
4343
for Microsoft.NETCore.App.Runtime.<rid> and Microsoft.NETCore.App.Crossgen2.<rid>.
4444
-->
4545
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
46-
<KnownFrameworkReference Update="Microsoft.NETCore.App">
47-
<RuntimePackRuntimeIdentifiers
48-
Condition="'%(TargetFramework)' == '$(NetCoreAppCurrent)'">%(RuntimePackRuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
49-
</KnownFrameworkReference>
50-
<KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
51-
<Crossgen2RuntimeIdentifiers
52-
Condition="'%(TargetFramework)' == '$(NetCoreAppCurrent)'" >%(Crossgen2RuntimeIdentifiers);$(NETCoreSdkRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
53-
</KnownCrossgen2Pack>
5446
<!-- Avoid references to Microsoft.AspNetCore.App.Runtime.<rid> -->
5547
<KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
5648
</ItemGroup>

‎eng/Version.Details.props‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props
4040
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion>19.1.0-alpha.1.25574.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkPackageVersion>
4141
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>19.1.0-alpha.1.25574.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsPackageVersion>
4242
<!-- dotnet/dotnet dependencies -->
43-
<MicrosoftCodeAnalysisPackageVersion>5.3.0-2.26055.102</MicrosoftCodeAnalysisPackageVersion>
44-
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.3.0-2.26055.102</MicrosoftCodeAnalysisAnalyzersPackageVersion>
45-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.3.0-2.26055.102</MicrosoftCodeAnalysisCSharpPackageVersion>
46-
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>11.0.100-alpha.1.26055.102</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
47-
<MicrosoftDotNetApiCompatTaskPackageVersion>11.0.100-alpha.1.26055.102</MicrosoftDotNetApiCompatTaskPackageVersion>
48-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetArcadeSdkPackageVersion>
49-
<MicrosoftDotNetBuildTasksArchivesPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetBuildTasksArchivesPackageVersion>
50-
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
51-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetBuildTasksInstallersPackageVersion>
52-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetBuildTasksPackagingPackageVersion>
53-
<MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>
54-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
55-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26055.102</MicrosoftDotNetCecilPackageVersion>
57-
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetCodeAnalysisPackageVersion>
58-
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetGenAPIPackageVersion>
59-
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetHelixSdkPackageVersion>
61-
<MicrosoftDotNetPackageTestingPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetPackageTestingPackageVersion>
62-
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetRemoteExecutorPackageVersion>
63-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
64-
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetXliffTasksPackageVersion>
65-
<MicrosoftDotNetXUnitAssertPackageVersion>2.9.3-beta.26055.102</MicrosoftDotNetXUnitAssertPackageVersion>
66-
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.9.3-beta.26055.102</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
67-
<MicrosoftDotNetXUnitExtensionsPackageVersion>11.0.0-beta.26055.102</MicrosoftDotNetXUnitExtensionsPackageVersion>
68-
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.26055.102</MicrosoftNetCompilersToolsetPackageVersion>
69-
<MicrosoftNETSdkILPackageVersion>11.0.0-alpha.1.26055.102</MicrosoftNETSdkILPackageVersion>
70-
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100TransportPackageVersion>11.0.100-alpha.1.26055.102</MicrosoftNETWorkloadEmscriptenCurrentManifest110100TransportPackageVersion>
71-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.26055.102</MicrosoftNETCoreAppRefPackageVersion>
72-
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-alpha.1.26055.102</MicrosoftNETCoreILAsmPackageVersion>
73-
<NuGetFrameworksPackageVersion>7.3.0-preview.1.5602</NuGetFrameworksPackageVersion>
74-
<NuGetPackagingPackageVersion>7.3.0-preview.1.5602</NuGetPackagingPackageVersion>
75-
<NuGetProjectModelPackageVersion>7.3.0-preview.1.5602</NuGetProjectModelPackageVersion>
76-
<NuGetVersioningPackageVersion>7.3.0-preview.1.5602</NuGetVersioningPackageVersion>
77-
<runtimenativeSystemIOPortsPackageVersion>11.0.0-alpha.1.26055.102</runtimenativeSystemIOPortsPackageVersion>
78-
<SystemCommandLinePackageVersion>3.0.0-alpha.1.26055.102</SystemCommandLinePackageVersion>
79-
<SystemReflectionMetadataPackageVersion>11.0.0-alpha.1.26055.102</SystemReflectionMetadataPackageVersion>
80-
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-alpha.1.26055.102</SystemReflectionMetadataLoadContextPackageVersion>
81-
<SystemTextJsonPackageVersion>11.0.0-alpha.1.26055.102</SystemTextJsonPackageVersion>
43+
<MicrosoftCodeAnalysisPackageVersion>5.3.0-2.26057.107</MicrosoftCodeAnalysisPackageVersion>
44+
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.3.0-2.26057.107</MicrosoftCodeAnalysisAnalyzersPackageVersion>
45+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.3.0-2.26057.107</MicrosoftCodeAnalysisCSharpPackageVersion>
46+
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>11.0.100-alpha.1.26057.107</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
47+
<MicrosoftDotNetApiCompatTaskPackageVersion>11.0.100-alpha.1.26057.107</MicrosoftDotNetApiCompatTaskPackageVersion>
48+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetArcadeSdkPackageVersion>
49+
<MicrosoftDotNetBuildTasksArchivesPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetBuildTasksArchivesPackageVersion>
50+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
51+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetBuildTasksInstallersPackageVersion>
52+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetBuildTasksPackagingPackageVersion>
53+
<MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetBuildTasksTargetFrameworkPackageVersion>
54+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
55+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
56+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26057.107</MicrosoftDotNetCecilPackageVersion>
57+
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetCodeAnalysisPackageVersion>
58+
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetGenAPIPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetHelixSdkPackageVersion>
61+
<MicrosoftDotNetPackageTestingPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetPackageTestingPackageVersion>
62+
<MicrosoftDotNetRemoteExecutorPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetRemoteExecutorPackageVersion>
63+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
64+
<MicrosoftDotNetXliffTasksPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetXliffTasksPackageVersion>
65+
<MicrosoftDotNetXUnitAssertPackageVersion>2.9.3-beta.26057.107</MicrosoftDotNetXUnitAssertPackageVersion>
66+
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.9.3-beta.26057.107</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
67+
<MicrosoftDotNetXUnitExtensionsPackageVersion>11.0.0-beta.26057.107</MicrosoftDotNetXUnitExtensionsPackageVersion>
68+
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.26057.107</MicrosoftNetCompilersToolsetPackageVersion>
69+
<MicrosoftNETSdkILPackageVersion>11.0.0-alpha.1.26057.107</MicrosoftNETSdkILPackageVersion>
70+
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100TransportPackageVersion>11.0.100-alpha.1.26057.107</MicrosoftNETWorkloadEmscriptenCurrentManifest110100TransportPackageVersion>
71+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-alpha.1.26057.107</MicrosoftNETCoreAppRefPackageVersion>
72+
<MicrosoftNETCoreILAsmPackageVersion>11.0.0-alpha.1.26057.107</MicrosoftNETCoreILAsmPackageVersion>
73+
<NuGetFrameworksPackageVersion>7.3.0-preview.1.5807</NuGetFrameworksPackageVersion>
74+
<NuGetPackagingPackageVersion>7.3.0-preview.1.5807</NuGetPackagingPackageVersion>
75+
<NuGetProjectModelPackageVersion>7.3.0-preview.1.5807</NuGetProjectModelPackageVersion>
76+
<NuGetVersioningPackageVersion>7.3.0-preview.1.5807</NuGetVersioningPackageVersion>
77+
<runtimenativeSystemIOPortsPackageVersion>11.0.0-alpha.1.26057.107</runtimenativeSystemIOPortsPackageVersion>
78+
<SystemCommandLinePackageVersion>3.0.0-alpha.1.26057.107</SystemCommandLinePackageVersion>
79+
<SystemReflectionMetadataPackageVersion>11.0.0-alpha.1.26057.107</SystemReflectionMetadataPackageVersion>
80+
<SystemReflectionMetadataLoadContextPackageVersion>11.0.0-alpha.1.26057.107</SystemReflectionMetadataLoadContextPackageVersion>
81+
<SystemTextJsonPackageVersion>11.0.0-alpha.1.26057.107</SystemTextJsonPackageVersion>
8282
<!-- dotnet/runtime-assets dependencies -->
8383
<MicrosoftDotNetCilStripSourcesPackageVersion>11.0.0-beta.25574.4</MicrosoftDotNetCilStripSourcesPackageVersion>
8484
<MicrosoftDotnetFuzzingTestDataPackageVersion>11.0.0-beta.25574.4</MicrosoftDotnetFuzzingTestDataPackageVersion>

0 commit comments

Comments
 (0)