Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,9 @@
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>9a1f02eff42635a5a9934735f12c722c3bfba8e8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Compatibility" Version="1.0.0-rc.2.21511.46">
<Dependency Name="Microsoft.DotNet.Compatibility" Version="1.1.0-preview.22164.17">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>f6028bc958dbab0094be39b94ba9e9c761cde13f</Sha>
<Sha>fa2be1406598f8e473af9061e07488ae0778ea11</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rtm.21514.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22161.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksFeedVersion>
Expand Down
6 changes: 0 additions & 6 deletions eng/packaging.targets
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
<Project>

<PropertyGroup>
<!--
Disable PackageValidation for non-CSProj since those will load only one roslyn assembly of the wrong
version causing the task to be in torn-state. See https://github.com/dotnet/runtime/pull/61697.
https://github.com/dotnet/runtime/issues/60883 tracks fixing this in 6.0 and removing this condition.
-->
<EnablePackageValidation Condition="'$(MSBuildProjectExtension)' == '.csproj'">true</EnablePackageValidation>
<!-- Don't restore prebuilt packages during sourcebuild. -->
<DisablePackageBaselineValidation Condition="'$(DotNetBuildFromSource)' == 'true'">true</DisablePackageBaselineValidation>
<PackageValidationBaselineVersion Condition="'$(PackageValidationBaselineVersion)' == ''">6.0.0</PackageValidationBaselineVersion>
Expand Down