Skip to content

Commit fb6b0bc

Browse files
DonnaChen888DonnaChen888
authored
Merge branch 'release/10.0.2xx' into merge/release/10.0.1xx-to-release/10.0.2xx
2 parents 87816e3 + f803b29 commit fb6b0bc

File tree

12 files changed

+565
-240
lines changed

12 files changed

+565
-240
lines changed

‎documentation/general/dotnet-run-file.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,16 @@ The directives are processed as follows:
248248
(because `ProjectReference` items don't support directory paths).
249249
An error is reported if zero or more than one projects are found in the directory, just like `dotnet reference add` would do.
250250

251+
Directive values support MSBuild variables (like `$(..)`) normally as they are translated literally and left to MSBuild engine to process.
252+
However, in `#:project` directives, variables might not be preserved during [grow up](#grow-up),
253+
because there is additional processing of those directives that makes it technically challenging to preserve variables in all cases
254+
(project directive values need to be resolved to be relative to the target directory
255+
and also to point to a project file rather than a directory).
256+
Note that it is not expected that variables inside the path change their meaning during the conversion,
257+
so for example `#:project ../$(LibName)` is translated to `<ProjectReference Include="../../$(LibName)/Lib.csproj" />` (i.e., the variable is preserved).
258+
However, variables at the start can change, so for example `#:project $(ProjectDir)../Lib` is translated to `<ProjectReference Include="../../Lib/Lib.csproj" />` (i.e., the variable is expanded).
259+
In other directives, all variables are preserved during conversion.
260+
251261
Because these directives are limited by the C# language to only appear before the first "C# token" and any `#if`,
252262
dotnet CLI can look for them via a regex or Roslyn lexer without any knowledge of defined conditional symbols
253263
and can do that efficiently by stopping the search when it sees the first "C# token".

‎eng/Version.Details.props‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,62 +6,62 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>10.0.0-preview.25556.109</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
10-
<MicrosoftBuildPackageVersion>18.1.0-preview-25556-109</MicrosoftBuildPackageVersion>
11-
<MicrosoftBuildLocalizationPackageVersion>18.1.0-preview-25556-109</MicrosoftBuildLocalizationPackageVersion>
12-
<MicrosoftBuildNuGetSdkResolverPackageVersion>7.0.0-preview.2.5709</MicrosoftBuildNuGetSdkResolverPackageVersion>
13-
<MicrosoftCodeAnalysisPackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisPackageVersion>
14-
<MicrosoftCodeAnalysisBuildClientPackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisBuildClientPackageVersion>
15-
<MicrosoftCodeAnalysisCSharpPackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisCSharpPackageVersion>
16-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
17-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
18-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
19-
<MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion>
20-
<MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion>
21-
<MicrosoftCodeAnalysisRazorToolingInternalPackageVersion>10.0.0-preview.25556.109</MicrosoftCodeAnalysisRazorToolingInternalPackageVersion>
22-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
23-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.3.0-1.25556.109</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
24-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25556.109</MicrosoftDotNetArcadeSdkPackageVersion>
25-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25556.109</MicrosoftDotNetBuildTasksInstallersPackageVersion>
26-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25556.109</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
27-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25556.109</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
28-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25556.109</MicrosoftDotNetHelixSdkPackageVersion>
29-
<MicrosoftDotNetSignToolPackageVersion>10.0.0-beta.25556.109</MicrosoftDotNetSignToolPackageVersion>
30-
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25556.109</MicrosoftDotNetXliffTasksPackageVersion>
31-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25556.109</MicrosoftDotNetXUnitExtensionsPackageVersion>
32-
<MicrosoftFSharpCompilerPackageVersion>15.0.200-servicing.25556.109</MicrosoftFSharpCompilerPackageVersion>
33-
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-1.25556.109</MicrosoftNetCompilersToolsetPackageVersion>
34-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.3.0-1.25556.109</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
9+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>10.0.0-preview.25562.107</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
10+
<MicrosoftBuildPackageVersion>18.1.0-preview-25562-107</MicrosoftBuildPackageVersion>
11+
<MicrosoftBuildLocalizationPackageVersion>18.1.0-preview-25562-107</MicrosoftBuildLocalizationPackageVersion>
12+
<MicrosoftBuildNuGetSdkResolverPackageVersion>7.1.0-preview.1.6307</MicrosoftBuildNuGetSdkResolverPackageVersion>
13+
<MicrosoftCodeAnalysisPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisPackageVersion>
14+
<MicrosoftCodeAnalysisBuildClientPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisBuildClientPackageVersion>
15+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisCSharpPackageVersion>
16+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
17+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
18+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
19+
<MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion>
20+
<MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion>
21+
<MicrosoftCodeAnalysisRazorToolingInternalPackageVersion>10.0.0-preview.25562.107</MicrosoftCodeAnalysisRazorToolingInternalPackageVersion>
22+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
23+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.3.0-1.25562.107</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
24+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25562.107</MicrosoftDotNetArcadeSdkPackageVersion>
25+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25562.107</MicrosoftDotNetBuildTasksInstallersPackageVersion>
26+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25562.107</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
27+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25562.107</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
28+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25562.107</MicrosoftDotNetHelixSdkPackageVersion>
29+
<MicrosoftDotNetSignToolPackageVersion>10.0.0-beta.25562.107</MicrosoftDotNetSignToolPackageVersion>
30+
<MicrosoftDotNetXliffTasksPackageVersion>10.0.0-beta.25562.107</MicrosoftDotNetXliffTasksPackageVersion>
31+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.25562.107</MicrosoftDotNetXUnitExtensionsPackageVersion>
32+
<MicrosoftFSharpCompilerPackageVersion>15.0.200-servicing.25562.107</MicrosoftFSharpCompilerPackageVersion>
33+
<MicrosoftNetCompilersToolsetPackageVersion>5.3.0-1.25562.107</MicrosoftNetCompilersToolsetPackageVersion>
34+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.3.0-1.25562.107</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
3535
<MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion>10.0.0-preview.7.25377.103</MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion>
36-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>10.0.0-preview.25556.109</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
37-
<MicrosoftNETTestSdkPackageVersion>18.1.0-preview-25556-109</MicrosoftNETTestSdkPackageVersion>
38-
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-rc.2.25556.109</MicrosoftTemplateEngineAbstractionsPackageVersion>
39-
<MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion>10.0.100-rc.2.25556.109</MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion>
40-
<MicrosoftTemplateEngineEdgePackageVersion>10.0.100-rc.2.25556.109</MicrosoftTemplateEngineEdgePackageVersion>
41-
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-rc.2.25556.109</MicrosoftTemplateEngineMocksPackageVersion>
42-
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>10.0.100-rc.2.25556.109</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
43-
<MicrosoftTemplateEngineTestHelperPackageVersion>10.0.100-rc.2.25556.109</MicrosoftTemplateEngineTestHelperPackageVersion>
44-
<MicrosoftTemplateEngineUtilsPackageVersion>10.0.100-rc.2.25556.109</MicrosoftTemplateEngineUtilsPackageVersion>
45-
<MicrosoftTemplateSearchCommonPackageVersion>10.0.100-rc.2.25556.109</MicrosoftTemplateSearchCommonPackageVersion>
46-
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>10.0.100-rc.2.25556.109</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
47-
<MicrosoftTestPlatformBuildPackageVersion>18.1.0-preview-25556-109</MicrosoftTestPlatformBuildPackageVersion>
48-
<MicrosoftTestPlatformCLIPackageVersion>18.1.0-preview-25556-109</MicrosoftTestPlatformCLIPackageVersion>
49-
<NuGetBuildTasksPackageVersion>7.0.0-preview.2.5709</NuGetBuildTasksPackageVersion>
50-
<NuGetBuildTasksConsolePackageVersion>7.0.0-preview.2.5709</NuGetBuildTasksConsolePackageVersion>
51-
<NuGetBuildTasksPackPackageVersion>7.0.0-preview.2.5709</NuGetBuildTasksPackPackageVersion>
52-
<NuGetCommandLineXPlatPackageVersion>7.0.0-preview.2.5709</NuGetCommandLineXPlatPackageVersion>
53-
<NuGetCommandsPackageVersion>7.0.0-preview.2.5709</NuGetCommandsPackageVersion>
54-
<NuGetCommonPackageVersion>7.0.0-preview.2.5709</NuGetCommonPackageVersion>
55-
<NuGetConfigurationPackageVersion>7.0.0-preview.2.5709</NuGetConfigurationPackageVersion>
56-
<NuGetCredentialsPackageVersion>7.0.0-preview.2.5709</NuGetCredentialsPackageVersion>
57-
<NuGetDependencyResolverCorePackageVersion>7.0.0-preview.2.5709</NuGetDependencyResolverCorePackageVersion>
58-
<NuGetFrameworksPackageVersion>7.0.0-preview.2.5709</NuGetFrameworksPackageVersion>
59-
<NuGetLibraryModelPackageVersion>7.0.0-preview.2.5709</NuGetLibraryModelPackageVersion>
60-
<NuGetLocalizationPackageVersion>7.0.0-preview.2.5709</NuGetLocalizationPackageVersion>
61-
<NuGetPackagingPackageVersion>7.0.0-preview.2.5709</NuGetPackagingPackageVersion>
62-
<NuGetProjectModelPackageVersion>7.0.0-preview.2.5709</NuGetProjectModelPackageVersion>
63-
<NuGetProtocolPackageVersion>7.0.0-preview.2.5709</NuGetProtocolPackageVersion>
64-
<NuGetVersioningPackageVersion>7.0.0-preview.2.5709</NuGetVersioningPackageVersion>
36+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>10.0.0-preview.25562.107</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
37+
<MicrosoftNETTestSdkPackageVersion>18.1.0-preview-25562-107</MicrosoftNETTestSdkPackageVersion>
38+
<MicrosoftTemplateEngineAbstractionsPackageVersion>10.0.100-rc.2.25562.107</MicrosoftTemplateEngineAbstractionsPackageVersion>
39+
<MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion>10.0.100-rc.2.25562.107</MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion>
40+
<MicrosoftTemplateEngineEdgePackageVersion>10.0.100-rc.2.25562.107</MicrosoftTemplateEngineEdgePackageVersion>
41+
<MicrosoftTemplateEngineMocksPackageVersion>10.0.100-rc.2.25562.107</MicrosoftTemplateEngineMocksPackageVersion>
42+
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>10.0.100-rc.2.25562.107</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
43+
<MicrosoftTemplateEngineTestHelperPackageVersion>10.0.100-rc.2.25562.107</MicrosoftTemplateEngineTestHelperPackageVersion>
44+
<MicrosoftTemplateEngineUtilsPackageVersion>10.0.100-rc.2.25562.107</MicrosoftTemplateEngineUtilsPackageVersion>
45+
<MicrosoftTemplateSearchCommonPackageVersion>10.0.100-rc.2.25562.107</MicrosoftTemplateSearchCommonPackageVersion>
46+
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>10.0.100-rc.2.25562.107</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
47+
<MicrosoftTestPlatformBuildPackageVersion>18.1.0-preview-25562-107</MicrosoftTestPlatformBuildPackageVersion>
48+
<MicrosoftTestPlatformCLIPackageVersion>18.1.0-preview-25562-107</MicrosoftTestPlatformCLIPackageVersion>
49+
<NuGetBuildTasksPackageVersion>7.1.0-preview.1.6307</NuGetBuildTasksPackageVersion>
50+
<NuGetBuildTasksConsolePackageVersion>7.1.0-preview.1.6307</NuGetBuildTasksConsolePackageVersion>
51+
<NuGetBuildTasksPackPackageVersion>7.1.0-preview.1.6307</NuGetBuildTasksPackPackageVersion>
52+
<NuGetCommandLineXPlatPackageVersion>7.1.0-preview.1.6307</NuGetCommandLineXPlatPackageVersion>
53+
<NuGetCommandsPackageVersion>7.1.0-preview.1.6307</NuGetCommandsPackageVersion>
54+
<NuGetCommonPackageVersion>7.1.0-preview.1.6307</NuGetCommonPackageVersion>
55+
<NuGetConfigurationPackageVersion>7.1.0-preview.1.6307</NuGetConfigurationPackageVersion>
56+
<NuGetCredentialsPackageVersion>7.1.0-preview.1.6307</NuGetCredentialsPackageVersion>
57+
<NuGetDependencyResolverCorePackageVersion>7.1.0-preview.1.6307</NuGetDependencyResolverCorePackageVersion>
58+
<NuGetFrameworksPackageVersion>7.1.0-preview.1.6307</NuGetFrameworksPackageVersion>
59+
<NuGetLibraryModelPackageVersion>7.1.0-preview.1.6307</NuGetLibraryModelPackageVersion>
60+
<NuGetLocalizationPackageVersion>7.1.0-preview.1.6307</NuGetLocalizationPackageVersion>
61+
<NuGetPackagingPackageVersion>7.1.0-preview.1.6307</NuGetPackagingPackageVersion>
62+
<NuGetProjectModelPackageVersion>7.1.0-preview.1.6307</NuGetProjectModelPackageVersion>
63+
<NuGetProtocolPackageVersion>7.1.0-preview.1.6307</NuGetProtocolPackageVersion>
64+
<NuGetVersioningPackageVersion>7.1.0-preview.1.6307</NuGetVersioningPackageVersion>
6565
<!-- _git/dotnet-dotnet dependencies -->
6666
<dotnetdevcertsPackageVersion>10.0.0-rc.2.25502.107</dotnetdevcertsPackageVersion>
6767
<dotnetuserjwtsPackageVersion>10.0.0-rc.2.25502.107</dotnetuserjwtsPackageVersion>

0 commit comments

Comments
 (0)