Skip to content

Commit 98d4911

Browse files
pavelsavarapavelsavara
authored
Merge branch 'main' into enable_runtimeConfig
2 parents a935911 + 35f0e62 commit 98d4911

File tree

64 files changed

+2113
-167
lines changed

Some content is hidden

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

64 files changed

+2113
-167
lines changed

‎CODEOWNERS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,3 @@
108108
# dotnet-format
109109
/src/BuiltInTools/dotnet-format @dotnet/roslyn-ide
110110
/test/dotnet-format.UnitTests @dotnet/roslyn-ide
111-
112-
# Area: VMR & SourceBuild
113-
/eng/DotNetBuild.props @dotnet/source-build @dotnet/product-construction

‎Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@
8888
<!-- These aliases need to live outside of Versions.props as VMR / source-build overwrites some of the version properties for live builds. -->
8989
<PropertyGroup>
9090
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
91-
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppHostwinx64PackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
92-
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
93-
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
94-
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
91+
<MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
92+
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
93+
<MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
94+
<MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
9595

9696
<HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
9797
<SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>

‎Directory.Build.targets

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
Condition="'$(RunTestsAsTool)' == 'true' And '$(CanRunTestAsTool)' == 'true'"/>
5555

5656
<!-- Update KnownFrameworkReferences to target the right version of the runtime -->
57-
<!-- We cannot use live shims when building tool packs in VMR - only package for current arch is available. -->
57+
<!-- Don't use live shims when building tool packs in .NET product build mode as only packages for the current arch are available. -->
5858
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'
5959
and $(MicrosoftNETCoreAppRefPackageVersion.StartsWith('$(_TargetFrameworkVersionWithoutV)'))
6060
and '$(MSBuildProjectName)' != 'sdk-tasks'
@@ -78,4 +78,33 @@
7878
</KnownFrameworkReference>
7979
</ItemGroup>
8080

81+
<!--
82+
Common content for all SDK source packages.
83+
-->
84+
85+
<PropertyGroup Condition="'$(IsSourcePackage)' == 'true'">
86+
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddEditorConfigToSourcePackage;_AddLinkedCompileItemsToSourcePackage</TargetsForTfmSpecificContentInPackage>
87+
<PackageDescription>
88+
$(PackageDescription)
89+
90+
The source code included in this package is subject to arbitrary changes in future versions.
91+
Updating a reference to this package to a newer version of the package may require changes in the referencing project.
92+
No compatibility guarantees are provided.
93+
</PackageDescription>
94+
</PropertyGroup>
95+
96+
<!-- Include SourcePackage.editorconfig in all source packages. -->
97+
<Target Name="_AddEditorConfigToSourcePackage">
98+
<ItemGroup>
99+
<TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" />
100+
</ItemGroup>
101+
</Target>
102+
103+
<!-- Include linked files. Arcade SDK only includes files in the project directory. -->
104+
<Target Name="_AddLinkedCompileItemsToSourcePackage">
105+
<ItemGroup>
106+
<TfmSpecificPackageFile Include="@(Compile)" Condition="'%(Compile.Link)' != ''" PackagePath="contentFiles/cs/$(TargetFramework)/%(Compile.Link)" BuildAction="Compile"/>
107+
</ItemGroup>
108+
</Target>
109+
81110
</Project>

‎eng/Publishing.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Artifact Update="$(ArtifactsShippingPackagesDir)dotnet-sdk-pgo-*" Visibility="External" />
3636
</ItemGroup>
3737

38-
<!-- temporarily remove the .Msi workload pack nugets in the SDK official build until we switch to the VMR, but keep the manifest .Msi packages -->
38+
<!-- Temporarily remove the .Msi workload pack nugets in non .NET product build mode (until the repo official build gets removed), but keep the manifest .Msi packages. -->
3939
<ItemGroup Condition="'$(DotNetBuild)' != 'true'">
4040
<MsiPackages Include="$(ArtifactsShippingPackagesDir)*.Msi.*.nupkg" />
4141
<MsiPackages Remove="$(ArtifactsShippingPackagesDir)*.Manifest-*.Msi.*.nupkg" />

‎eng/SourcePackage.editorconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Remove the line below if you want to inherit .editorconfig settings from higher directories
2+
root = true
3+
4+
# C# files
5+
[*.cs]
6+
7+
# We don't want any analyzer diagnostics to be reported for people consuming this as a source package.
8+
dotnet_analyzer_diagnostic.severity = none
9+
10+
generated_code = true
11+
12+
# The above configurations don't apply to compiler warnings. Requiring all params to be documented
13+
# is not something we require for this project, so suppressing it directly here.
14+
dotnet_diagnostic.CS1573.severity = none
15+
16+
# As above, we need to specifically disable compiler warnings that we don't want to break downstream
17+
# builds
18+
dotnet_diagnostic.IDE0005.severity = none

‎eng/Version.Details.xml

Lines changed: 39 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,6 @@
4242
<Uri>https://github.com/dotnet/dotnet</Uri>
4343
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
4444
</Dependency>
45-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25265.101">
46-
<Uri>https://github.com/dotnet/dotnet</Uri>
47-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
48-
</Dependency>
49-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.10.0" Version="10.0.0-preview.5.25265.101">
50-
<Uri>https://github.com/dotnet/dotnet</Uri>
51-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
52-
</Dependency>
53-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25265.101">
54-
<Uri>https://github.com/dotnet/dotnet</Uri>
55-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
56-
</Dependency>
57-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="10.0.0-preview.5.25265.101">
58-
<Uri>https://github.com/dotnet/dotnet</Uri>
59-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
60-
</Dependency>
6145
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-preview.5.25265.101">
6246
<Uri>https://github.com/dotnet/dotnet</Uri>
6347
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
@@ -133,74 +117,74 @@
133117
<Uri>https://github.com/dotnet/dotnet</Uri>
134118
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
135119
</Dependency>
136-
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.15.0-preview.1.55">
120+
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.15.0-preview.1.56">
137121
<Uri>https://github.com/nuget/nuget.client</Uri>
138-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
122+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
139123
</Dependency>
140-
<Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.55">
124+
<Dependency Name="NuGet.Build.Tasks" Version="6.15.0-preview.1.56">
141125
<Uri>https://github.com/nuget/nuget.client</Uri>
142-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
126+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
143127
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
144128
</Dependency>
145-
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.15.0-preview.1.55">
129+
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.15.0-preview.1.56">
146130
<Uri>https://github.com/nuget/nuget.client</Uri>
147-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
131+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
148132
</Dependency>
149-
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.15.0-preview.1.55">
133+
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.15.0-preview.1.56">
150134
<Uri>https://github.com/nuget/nuget.client</Uri>
151-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
135+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
152136
</Dependency>
153-
<Dependency Name="NuGet.Commands" Version="6.15.0-preview.1.55">
137+
<Dependency Name="NuGet.Commands" Version="6.15.0-preview.1.56">
154138
<Uri>https://github.com/nuget/nuget.client</Uri>
155-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
139+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
156140
</Dependency>
157-
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.15.0-preview.1.55">
141+
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.15.0-preview.1.56">
158142
<Uri>https://github.com/nuget/nuget.client</Uri>
159-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
143+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
160144
</Dependency>
161-
<Dependency Name="NuGet.Common" Version="6.15.0-preview.1.55">
145+
<Dependency Name="NuGet.Common" Version="6.15.0-preview.1.56">
162146
<Uri>https://github.com/nuget/nuget.client</Uri>
163-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
147+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
164148
</Dependency>
165-
<Dependency Name="NuGet.Configuration" Version="6.15.0-preview.1.55">
149+
<Dependency Name="NuGet.Configuration" Version="6.15.0-preview.1.56">
166150
<Uri>https://github.com/nuget/nuget.client</Uri>
167-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
151+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
168152
</Dependency>
169-
<Dependency Name="NuGet.Credentials" Version="6.15.0-preview.1.55">
153+
<Dependency Name="NuGet.Credentials" Version="6.15.0-preview.1.56">
170154
<Uri>https://github.com/nuget/nuget.client</Uri>
171-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
155+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
172156
</Dependency>
173-
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.15.0-preview.1.55">
157+
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.15.0-preview.1.56">
174158
<Uri>https://github.com/nuget/nuget.client</Uri>
175-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
159+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
176160
</Dependency>
177-
<Dependency Name="NuGet.Frameworks" Version="6.15.0-preview.1.55">
161+
<Dependency Name="NuGet.Frameworks" Version="6.15.0-preview.1.56">
178162
<Uri>https://github.com/nuget/nuget.client</Uri>
179-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
163+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
180164
</Dependency>
181-
<Dependency Name="NuGet.LibraryModel" Version="6.15.0-preview.1.55">
165+
<Dependency Name="NuGet.LibraryModel" Version="6.15.0-preview.1.56">
182166
<Uri>https://github.com/nuget/nuget.client</Uri>
183-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
167+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
184168
</Dependency>
185-
<Dependency Name="NuGet.ProjectModel" Version="6.15.0-preview.1.55">
169+
<Dependency Name="NuGet.ProjectModel" Version="6.15.0-preview.1.56">
186170
<Uri>https://github.com/nuget/nuget.client</Uri>
187-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
171+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
188172
</Dependency>
189-
<Dependency Name="NuGet.Protocol" Version="6.15.0-preview.1.55">
173+
<Dependency Name="NuGet.Protocol" Version="6.15.0-preview.1.56">
190174
<Uri>https://github.com/nuget/nuget.client</Uri>
191-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
175+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
192176
</Dependency>
193-
<Dependency Name="NuGet.Packaging" Version="6.15.0-preview.1.55">
177+
<Dependency Name="NuGet.Packaging" Version="6.15.0-preview.1.56">
194178
<Uri>https://github.com/nuget/nuget.client</Uri>
195-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
179+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
196180
</Dependency>
197-
<Dependency Name="NuGet.Versioning" Version="6.15.0-preview.1.55">
181+
<Dependency Name="NuGet.Versioning" Version="6.15.0-preview.1.56">
198182
<Uri>https://github.com/nuget/nuget.client</Uri>
199-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
183+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
200184
</Dependency>
201-
<Dependency Name="NuGet.Localization" Version="6.15.0-preview.1.55">
185+
<Dependency Name="NuGet.Localization" Version="6.15.0-preview.1.56">
202186
<Uri>https://github.com/nuget/nuget.client</Uri>
203-
<Sha>4094d24566d019145b3f7ca594c4cce72d34f069</Sha>
187+
<Sha>cd2f5c4be1dfd21e7331aebebbbbee14111f348d</Sha>
204188
</Dependency>
205189
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.15.0-preview-25265-101">
206190
<Uri>https://github.com/dotnet/dotnet</Uri>
@@ -238,20 +222,11 @@
238222
<Uri>https://github.com/dotnet/dotnet</Uri>
239223
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
240224
</Dependency>
241-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-preview.5.25265.101">
242-
<Uri>https://github.com/dotnet/dotnet</Uri>
243-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
244-
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
245-
</Dependency>
246-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25265.101">
247-
<Uri>https://github.com/dotnet/dotnet</Uri>
248-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
249-
</Dependency>
250225
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="10.0.0-preview.5.25265.101">
251226
<Uri>https://github.com/dotnet/dotnet</Uri>
252227
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
253228
</Dependency>
254-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0" Version="10.0.0-preview.5.25265.101">
229+
<Dependency Name="Microsoft.WindowsDesktop.App.Internal" Version="10.0.0-preview.5.25265.101">
255230
<Uri>https://github.com/dotnet/dotnet</Uri>
256231
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
257232
</Dependency>
@@ -267,14 +242,6 @@
267242
<Uri>https://github.com/dotnet/dotnet</Uri>
268243
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
269244
</Dependency>
270-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.5.25265.101">
271-
<Uri>https://github.com/dotnet/dotnet</Uri>
272-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
273-
</Dependency>
274-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.5.25265.101">
275-
<Uri>https://github.com/dotnet/dotnet</Uri>
276-
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
277-
</Dependency>
278245
<Dependency Name="dotnet-dev-certs" Version="10.0.0-preview.5.25265.101">
279246
<Uri>https://github.com/dotnet/dotnet</Uri>
280247
<Sha>ad8565092bbfdd5c8b4a94a718d10b2d394f7aee</Sha>
@@ -579,13 +546,13 @@
579546
<Uri>https://github.com/dotnet/arcade-services</Uri>
580547
<Sha>7126d7cb6f801691b0dfcc4e8357471f8dc750a9</Sha>
581548
</Dependency>
582-
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25262.2">
549+
<Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25266.2">
583550
<Uri>https://github.com/microsoft/testfx</Uri>
584-
<Sha>9a016c071b017918233cbf99e1d21144fb9ce5f3</Sha>
551+
<Sha>7f47c26b682dc8b937b8cd2375fa1b976e39e6a1</Sha>
585552
</Dependency>
586-
<Dependency Name="MSTest" Version="3.10.0-preview.25262.2">
553+
<Dependency Name="MSTest" Version="3.10.0-preview.25266.2">
587554
<Uri>https://github.com/microsoft/testfx</Uri>
588-
<Sha>9a016c071b017918233cbf99e1d21144fb9ce5f3</Sha>
555+
<Sha>7f47c26b682dc8b937b8cd2375fa1b976e39e6a1</Sha>
589556
</Dependency>
590557
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.5.25265.101">
591558
<Uri>https://github.com/dotnet/dotnet</Uri>

0 commit comments

Comments
 (0)