From 35d6ebc01728d222477a8996902da3507f059340 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Thu, 21 Oct 2021 23:15:23 +0000 Subject: [PATCH 01/12] lift version of Microsoft.CodeAnalysis.Common dependencies to previously source built versions --- .../CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj index 7eae8afa2756a..e0fc16d52e2c0 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj @@ -28,4 +28,10 @@ + + + + + + \ No newline at end of file From a8ee96d14e0d3e99dd02e3a7e2546d34d4d19b01 Mon Sep 17 00:00:00 2001 From: Logan Bussell <36081148+lbussell@users.noreply.github.com> Date: Fri, 8 Oct 2021 00:56:41 +0000 Subject: [PATCH 02/12] remove Microsoft.DotNet prebuilts Pull request for applying this patch: https://github.com/dotnet/roslyn/pull/57159 --- eng/Tools.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Tools.props b/eng/Tools.props index 1579b5105586b..944448855ee74 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -1,6 +1,6 @@ - + - $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" + $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" + $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" From f0d0e9a0be3ec8a837507af808904e7d7e94ec96 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 10 Jan 2022 10:41:57 -0800 Subject: [PATCH 05/12] change lifted package version names to refonly and set them if they aren't set --- eng/Versions.props | 26 +++++++++++-------- .../CSharpSyntaxGenerator.csproj | 8 +++--- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3efdde6caa172..66ae4930820f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,17 +54,6 @@ 2.2.0 7.1.0.6543 1.4.1 - - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) 6.0.0-preview.0.15 16.10.23 + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) + $(SystemCollectionsImmutableVersion) + $(SystemReflectionMetadataVersion) + $(SystemRuntimeCompilerServicesUnsafeVersion) + $(SystemTextEncodingCodePagesVersion) true diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj index e0fc16d52e2c0..6fce2c963a5d4 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj @@ -29,9 +29,9 @@ - - - - + + + + \ No newline at end of file From 101eac513abebca64f037439b454eea1ca151143 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 10 Jan 2022 11:07:49 -0800 Subject: [PATCH 06/12] remove unnecessary source-build conditions --- eng/SourceBuild.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index d08de564be1c8..9905b35467e53 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -11,8 +11,7 @@ --> - $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" - $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" + $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" From 912ab07c1b554660fe7c28d13914a7e34e95f7aa Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 10 Jan 2022 12:55:17 -0800 Subject: [PATCH 07/12] refactor CSharpSyntaxGenerator project to use Choose for targetframework --- .../CSharpSyntaxGenerator.csproj | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj index 6fce2c963a5d4..548a0e9b53bfc 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj @@ -19,19 +19,27 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 672e329ccb3c7f925e5b12d6fd0a8c017fbf7081 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 12 Jan 2022 10:52:46 -0800 Subject: [PATCH 08/12] Revert "remove unnecessary source-build conditions" This reverts commit cf87bb22d3500f77153f5a7e4f0c6a7b46f0b084. --- eng/SourceBuild.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 9905b35467e53..d08de564be1c8 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -11,7 +11,8 @@ --> - $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" + $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" + $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" From 8df52ca633149e7181f09f7e526c2eb9d61a9d7b Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 12 Jan 2022 10:53:10 -0800 Subject: [PATCH 09/12] Revert "build a subset of roslyn projects" This reverts commit 3d2485b573a18503caec7d6ec32c5e655eb4ffbe. --- Roslyn.SourceBuild.slnf | 105 ---------------------------------------- eng/SourceBuild.props | 3 +- 2 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 Roslyn.SourceBuild.slnf diff --git a/Roslyn.SourceBuild.slnf b/Roslyn.SourceBuild.slnf deleted file mode 100644 index 70af57b27142e..0000000000000 --- a/Roslyn.SourceBuild.slnf +++ /dev/null @@ -1,105 +0,0 @@ -{ - "solution": { - "path": "Roslyn.sln", - "projects": [ - "src\\Deployment\\RoslynDeployment.csproj", - "src\\Compilers\\Core\\Portable\\Microsoft.CodeAnalysis.csproj", - "src\\Compilers\\Server\\VBCSCompiler\\VBCSCompiler.csproj", - "src\\Compilers\\CSharp\\csc\\csc.csproj", - "src\\Compilers\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.csproj", - "src\\Compilers\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.vbproj", - "src\\Workspaces\\Core\\Portable\\Microsoft.CodeAnalysis.Workspaces.csproj", - "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\BoundTreeGenerator\\CompilersBoundTreeGenerator.csproj", - "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpErrorFactsGenerator\\CSharpErrorFactsGenerator.csproj", - "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\CSharpSyntaxGenerator\\CSharpSyntaxGenerator.csproj", - "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicSyntaxGenerator\\VisualBasicSyntaxGenerator.vbproj", - "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\VisualBasicErrorFactsGenerator\\VisualBasicErrorFactsGenerator.vbproj", - "src\\Workspaces\\Core\\Desktop\\Microsoft.CodeAnalysis.Workspaces.Desktop.csproj", - "src\\Workspaces\\Core\\MSBuild\\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj", - "src\\Workspaces\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj", - "src\\Workspaces\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj", - "src\\Features\\VisualBasic\\Portable\\Microsoft.CodeAnalysis.VisualBasic.Features.vbproj", - "src\\Features\\CSharp\\Portable\\Microsoft.CodeAnalysis.CSharp.Features.csproj", - "src\\Features\\Core\\Portable\\Microsoft.CodeAnalysis.Features.csproj", - "src\\Scripting\\VisualBasic\\Microsoft.CodeAnalysis.VisualBasic.Scripting.vbproj", - "src\\Scripting\\Core\\Microsoft.CodeAnalysis.Scripting.csproj", - "src\\Scripting\\CSharp\\Microsoft.CodeAnalysis.CSharp.Scripting.csproj", - "src\\ExpressionEvaluator\\Package\\ExpressionEvaluatorPackage.csproj", - "src\\ExpressionEvaluator\\CSharp\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.csproj", - "src\\ExpressionEvaluator\\VisualBasic\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.vbproj", - "src\\ExpressionEvaluator\\Core\\Source\\ExpressionCompiler\\Microsoft.CodeAnalysis.ExpressionCompiler.csproj", - "src\\Compilers\\Core\\AnalyzerDriver\\AnalyzerDriver.shproj", - "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\BasicResultProvider.shproj", - "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\NetFX20\\BasicResultProvider.NetFX20.vbproj", - "src\\ExpressionEvaluator\\VisualBasic\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.VisualBasic.ResultProvider.vbproj", - "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\CSharpResultProvider.shproj", - "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\NetFX20\\CSharpResultProvider.NetFX20.csproj", - "src\\ExpressionEvaluator\\CSharp\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.CSharp.ResultProvider.csproj", - "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\ResultProvider.shproj", - "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\NetFX20\\ResultProvider.NetFX20.csproj", - "src\\ExpressionEvaluator\\Core\\Source\\ResultProvider\\Portable\\Microsoft.CodeAnalysis.ResultProvider.csproj", - "src\\Compilers\\VisualBasic\\vbc\\vbc.csproj", - "src\\Compilers\\VisualBasic\\BasicAnalyzerDriver\\BasicAnalyzerDriver.shproj", - "src\\Compilers\\CSharp\\CSharpAnalyzerDriver\\CSharpAnalyzerDriver.shproj", - "src\\Compilers\\Core\\CommandLine\\CommandLine.shproj", - "src\\Compilers\\Extension\\Roslyn.Compilers.Extension.csproj", - "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.shproj", - "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.shproj", - "src\\Workspaces\\Remote\\Core\\Microsoft.CodeAnalysis.Remote.Workspaces.csproj", - "src\\Workspaces\\Remote\\ServiceHub\\Microsoft.CodeAnalysis.Remote.ServiceHub.csproj", - "src\\Compilers\\Core\\MSBuildTask\\Microsoft.Build.Tasks.CodeAnalysis.csproj", - "src\\Tools\\BuildBoss\\BuildBoss.csproj", - "src\\ExpressionEvaluator\\Core\\Source\\FunctionResolver\\Microsoft.CodeAnalysis.FunctionResolver.csproj", - "src\\CodeStyle\\Core\\Analyzers\\Microsoft.CodeAnalysis.CodeStyle.csproj", - "src\\CodeStyle\\Core\\CodeFixes\\Microsoft.CodeAnalysis.CodeStyle.Fixes.csproj", - "src\\CodeStyle\\CSharp\\Analyzers\\Microsoft.CodeAnalysis.CSharp.CodeStyle.csproj", - "src\\CodeStyle\\CSharp\\CodeFixes\\Microsoft.CodeAnalysis.CSharp.CodeStyle.Fixes.csproj", - "src\\CodeStyle\\VisualBasic\\Analyzers\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.vbproj", - "src\\CodeStyle\\VisualBasic\\CodeFixes\\Microsoft.CodeAnalysis.VisualBasic.CodeStyle.Fixes.vbproj", - "src\\Tools\\AnalyzerRunner\\AnalyzerRunner.csproj", - "src\\Dependencies\\CodeAnalysis.Debugging\\Microsoft.CodeAnalysis.Debugging.Package.csproj", - "src\\Dependencies\\PooledObjects\\Microsoft.CodeAnalysis.PooledObjects.Package.csproj", - "src\\NuGet\\Microsoft.Net.Compilers\\Microsoft.Net.Compilers.Package.csproj", - "src\\NuGet\\Microsoft.NETCore.Compilers\\Microsoft.NETCore.Compilers.Package.csproj", - "src\\NuGet\\Microsoft.CodeAnalysis.Compilers.Package.csproj", - "src\\NuGet\\Microsoft.CodeAnalysis.Scripting.Package.csproj", - "src\\NuGet\\Microsoft.CodeAnalysis.EditorFeatures.Package.csproj", - "src\\NuGet\\Microsoft.CodeAnalysis.Package.csproj", - "src\\Setup\\DevDivVsix\\CompilersPackage\\Microsoft.CodeAnalysis.Compilers.Setup.csproj", - "src\\Setup\\Installer\\Installer.Package.csproj", - "src\\Setup\\DevDivInsertionFiles\\DevDivInsertionFiles.csproj", - "src\\Tools\\ExternalAccess\\FSharp\\Microsoft.CodeAnalysis.ExternalAccess.FSharp.csproj", - "src\\Tools\\ExternalAccess\\Razor\\Microsoft.CodeAnalysis.ExternalAccess.Razor.csproj", - "src\\NuGet\\Microsoft.Net.Compilers.Toolset\\Microsoft.Net.Compilers.Toolset.Package.csproj", - "src\\Features\\LanguageServer\\Protocol\\Microsoft.CodeAnalysis.LanguageServer.Protocol.csproj", - "src\\Tools\\ExternalAccess\\Debugger\\Microsoft.CodeAnalysis.ExternalAccess.Debugger.csproj", - "src\\Tools\\ExternalAccess\\Xamarin.Remote\\Microsoft.CodeAnalysis.ExternalAccess.Xamarin.Remote.csproj", - "src\\Tools\\ExternalAccess\\Apex\\Microsoft.CodeAnalysis.ExternalAccess.Apex.csproj", - "src\\Tools\\IdeBenchmarks\\IdeBenchmarks.csproj", - "src\\Tools\\Source\\CompilerGeneratorTools\\Source\\IOperationGenerator\\CompilersIOperationGenerator.csproj", - "src\\Features\\Lsif\\Generator\\Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj", - "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\Core\\CompilerExtensions.shproj", - "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\Core\\WorkspaceExtensions.shproj", - "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\CSharp\\CSharpCompilerExtensions.shproj", - "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\CSharp\\CSharpWorkspaceExtensions.shproj", - "src\\Workspaces\\SharedUtilitiesAndExtensions\\Compiler\\VisualBasic\\VisualBasicCompilerExtensions.shproj", - "src\\Workspaces\\SharedUtilitiesAndExtensions\\Workspace\\VisualBasic\\VisualBasicWorkspaceExtensions.shproj", - "src\\Analyzers\\Core\\Analyzers\\Analyzers.shproj", - "src\\Analyzers\\Core\\CodeFixes\\CodeFixes.shproj", - "src\\Analyzers\\CSharp\\Analyzers\\CSharpAnalyzers.shproj", - "src\\Analyzers\\CSharp\\CodeFixes\\CSharpCodeFixes.shproj", - "src\\Analyzers\\VisualBasic\\Analyzers\\VisualBasicAnalyzers.shproj", - "src\\Analyzers\\VisualBasic\\CodeFixes\\VisualBasicCodeFixes.shproj", - "src\\Tools\\IdeCoreBenchmarks\\IdeCoreBenchmarks.csproj", - "src\\Tools\\BuildValidator\\BuildValidator.csproj", - "src\\Tools\\BuildActionTelemetryTable\\BuildActionTelemetryTable.csproj", - "src\\CodeStyle\\Tools\\CodeStyleConfigFileGenerator.csproj", - "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.shproj", - "src\\Dependencies\\Collections\\Microsoft.CodeAnalysis.Collections.Package.csproj", - "src\\Compilers\\Core\\Rebuild\\Microsoft.CodeAnalysis.Rebuild.csproj", - "src\\Tools\\ExternalAccess\\OmniSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.csproj", - "src\\Tools\\ExternalAccess\\OmniSharp.CSharp\\Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp.csproj", - "src\\Workspaces\\Remote\\ServiceHub.CoreComponents\\Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.csproj" - ] - } -} \ No newline at end of file diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index d08de564be1c8..92e316a47440b 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -11,8 +11,7 @@ --> - $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" - $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.SourceBuild.slnf" + $(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\Roslyn.sln" From 56dc22baca2a52b5090b2b16773b12d983c3c50c Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 20 Jan 2022 11:55:54 -0800 Subject: [PATCH 10/12] change RefOnly variable name prefixes back to SourceBuildLifted --- eng/Versions.props | 8 ++++---- .../CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 66ae4930820f9..7935a8d7cbd00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -274,10 +274,10 @@ $(RefOnlyMicrosoftBuildPackagesVersion) $(RefOnlyMicrosoftBuildPackagesVersion) $(RefOnlyMicrosoftBuildPackagesVersion) - $(SystemCollectionsImmutableVersion) - $(SystemReflectionMetadataVersion) - $(SystemRuntimeCompilerServicesUnsafeVersion) - $(SystemTextEncodingCodePagesVersion) + $(SystemCollectionsImmutableVersion) + $(SystemReflectionMetadataVersion) + $(SystemRuntimeCompilerServicesUnsafeVersion) + $(SystemTextEncodingCodePagesVersion) true diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj index 548a0e9b53bfc..97b51b3d58cac 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj @@ -26,10 +26,10 @@ - - - - + + + + From 3e570b5a2778a3f39c957e3e145ec6c90cc30353 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 21 Jan 2022 17:22:14 -0800 Subject: [PATCH 11/12] update BuildBoss to allow new source build package version prefix --- src/Tools/BuildBoss/ProjectCheckerUtil.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs index 0cb613b77a64f..4f8a53b49b580 100644 --- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs +++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs @@ -158,6 +158,7 @@ private IEnumerable GetAllowedPackageReferenceVersions(PackageReference yield return $"$({name}Version)"; yield return $"$({name}FixedVersion)"; yield return $"$(RefOnly{name}Version)"; + yield return $"$(SourceBuildLifted{name}Version)"; } } From caa111e8a1395da12ca6fab4f5a45205244ff512 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 18 Feb 2022 16:39:33 -0800 Subject: [PATCH 12/12] Revert changes for lifting some package versions for source-build --- eng/Versions.props | 26 +++++++--------- src/Tools/BuildBoss/ProjectCheckerUtil.cs | 1 - .../CSharpSyntaxGenerator.csproj | 30 +++++-------------- 3 files changed, 19 insertions(+), 38 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f2eeccc93d3d4..46e3a8b7dab53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,6 +55,17 @@ 2.2.0 7.1.0.6543 1.4.1 + + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) + $(RefOnlyMicrosoftBuildPackagesVersion) 6.0.0-preview.0.15 17.0.51 - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) - $(RefOnlyMicrosoftBuildPackagesVersion) - $(SystemCollectionsImmutableVersion) - $(SystemReflectionMetadataVersion) - $(SystemRuntimeCompilerServicesUnsafeVersion) - $(SystemTextEncodingCodePagesVersion) true diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs index 4f8a53b49b580..0cb613b77a64f 100644 --- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs +++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs @@ -158,7 +158,6 @@ private IEnumerable GetAllowedPackageReferenceVersions(PackageReference yield return $"$({name}Version)"; yield return $"$({name}FixedVersion)"; yield return $"$(RefOnly{name}Version)"; - yield return $"$(SourceBuildLifted{name}Version)"; } } diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj index 97b51b3d58cac..7eae8afa2756a 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj +++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj @@ -19,27 +19,13 @@ + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file