Closed
Conversation
26 tasks
Member
Author
|
Oh, interesting. This apparently is causing an issue later on in the build in symreader that I need to investigate. Changing this to draft for now. |
ViktorHofer
reviewed
May 24, 2023
Comment on lines
+34
to
+46
| diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | ||
| index d73f6abd..20c0c33b 100644 | ||
| --- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | ||
| +++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj | ||
| @@ -14,11 +14,6 @@ | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MsbuildTaskMicrosoftCodeAnalysisCSharpVersion)" ExcludeAssets="analyzers" Publish="false" /> | ||
| </ItemGroup> | ||
|
|
||
| - <!-- When building offline we need to bump the version of System.Reflection.Metadata that CodeAnalysis package depends on to match what the source build tarball expects. --> | ||
| - <ItemGroup Condition="'$(DotNetBuildOffline)' == 'true'"> | ||
| - <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> | ||
| - </ItemGroup> | ||
| - |
Member
There was a problem hiding this comment.
This patch is no longer necessary. Remove.
ViktorHofer
reviewed
May 24, 2023
Comment on lines
+13
to
+30
| diff --git a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj | ||
| index d1ac5ccb..5cdfd539 100644 | ||
| --- a/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj | ||
| +++ b/src/Microsoft.DotNet.CodeAnalysis/Microsoft.DotNet.CodeAnalysis.csproj | ||
| @@ -12,16 +12,6 @@ | ||
| <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" ExcludeAssets="analyzers" /> | ||
| </ItemGroup> | ||
|
|
||
| - <!-- | ||
| - In the source-build tarball build, Microsoft.CodeAnalysis.CSharp has dependencies on old | ||
| - versions of these packages due to repo build order. Override to lift them to the versions passed | ||
| - in via DotNetPackageVersionPropsPath. | ||
| - --> | ||
| - <ItemGroup Condition="'$(DotNetBuildFromSource)' == 'true'"> | ||
| - <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" /> | ||
| - <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> | ||
| - </ItemGroup> | ||
| - |
Member
There was a problem hiding this comment.
This patch is no longer necessary either.
ViktorHofer
reviewed
May 24, 2023
Comment on lines
+20
to
+23
| + <Dependency Name="System.IO.Packaging" Version="4.5.0"> | ||
| + <Uri>https://github.com/dotnet/corefx</Uri> | ||
| + <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha> | ||
| + </Dependency> |
Member
There was a problem hiding this comment.
Suggested change
| + <Dependency Name="System.IO.Packaging" Version="4.5.0"> | |
| + <Uri>https://github.com/dotnet/corefx</Uri> | |
| + <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha> | |
| + </Dependency> | |
| + <Dependency Name="System.IO.Packaging" Version="7.0.0"> | |
| + <Uri>https://github.com/dotnet/runtime</Uri> | |
| + <Sha>30ab651fcb4354552bd4891619a0bdd81e0ebdbf</Sha> | |
| + </Dependency> |
ViktorHofer
reviewed
May 24, 2023
Comment on lines
+26
to
+29
| + <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0"> | ||
| + <Uri>https://github.com/dotnet/runtime</Uri> | ||
| + <Sha>8470979eb44c2218025515234d3e01138bd74afb</Sha> | ||
| </Dependency> |
Member
There was a problem hiding this comment.
This is outdated as well but I'm not sure what the version should be.
Member
|
Closing as obsolete. See #16592. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contributes to dotnet/source-build#3043
Patch changes backported at dotnet/arcade#13009