Skip to content

Commit

Permalink
Fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
ladipro committed Feb 19, 2024
2 parents e3a684f + 3f6dd37 commit ab5267f
Show file tree
Hide file tree
Showing 145 changed files with 1,583 additions and 2,241 deletions.
572 changes: 0 additions & 572 deletions .github/fabricbot.json

This file was deleted.

149 changes: 149 additions & 0 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
id:
name: GitOps.PullRequestIssueManagement
description: GitOps.PullRequestIssueManagement primitive
owner:
resource: repository
disabled: false
where:
configuration:
resourceManagementConfiguration:
scheduledSearches:
- description: Mark Stale Issues
frequencies:
- daily:
time: 17:0
filters:
- isOpen
- hasLabel:
label: needs-more-info
- isNotPartOfMilestone:
milestone: Backlog
- isNotPartOfMilestone:
milestone: Discussion
- isNotLabeledWith:
label: needs-triage
- isIssue
- isNotLabeledWith:
label: stale
- noActivitySince:
days: 30
- isNotLabeledWith:
label: bot-exclude
actions:
- addLabel:
label: stale
- addReply:
reply: This issue is marked as stale because feedback has been requested for 30 days with no response. Please respond within 14 days or this issue will be closed due to inactivity.
- description: Close Stale Issues
frequencies:
- daily:
time: 12:0
filters:
- isOpen
- hasLabel:
label: stale
- isNotLabeledWith:
label: bot-exclude
- noActivitySince:
days: 14
- isNotPartOfMilestone:
milestone: Backlog
- isNotPartOfMilestone:
milestone: Discussion
- isNotLabeledWith:
label: needs-triage
actions:
- closeIssue
- addReply:
reply: This issue was closed due to inactivity. If you can still reproduce this bug, please comment with the requested information, detailed steps to reproduce the problem, or any other notes that might help in the investigation.
- addLabel:
label: closed-by-bot
eventResponderTasks:
- if:
- payloadType: Issue_Comment
- isOpen
- hasLabel:
label: stale
- not:
hasLabel:
label: bot-exclude
then:
- removeLabel:
label: stale
- addLabel:
label: needs-triage
description: Unstale Open Issues that get comments
- if:
- payloadType: Issue_Comment
- not: isOpen
- hasLabel:
label: stale
- not:
hasLabel:
label: bot-exclude
then:
- addLabel:
label: needs-triage
description: Apply needs-triage to closed stale issues that get comments
- if:
- payloadType: Issues
- labelAdded:
label: needs-more-info
- hasLabel:
label: needs-triage
then:
- removeLabel:
label: needs-triage
description: remove needs-triage when needs-more-info is applied
- if:
- payloadType: Issue_Comment
- isActivitySender:
issueAuthor: True
- hasLabel:
label: needs-more-info
then:
- addLabel:
label: needs-triage
- addLabel:
label: author-responded
- removeLabel:
label: needs-more-info
description: author responds to `needs-more-info` gets `author-responded`
- if:
- payloadType: Pull_Request
- or:
- isAction:
action: Opened
- isAction:
action: Reopened
- labelAdded:
label: Servicing-consider
- or:
- targetsBranch:
branch: vs17.0
- targetsBranch:
branch: vs17.2
- targetsBranch:
branch: vs17.4
- targetsBranch:
branch: vs17.5
- targetsBranch:
branch: vs17.6
- targetsBranch:
branch: vs17.7
- targetsBranch:
branch: vs17.8
- targetsBranch:
branch: vs17.9
- targetsBranch:
branch: vs17.10
- targetsBranch:
branch: vs16.11
- targetsBranch:
branch: vs15.9
then:
- addReply:
reply: Hello! I noticed that you're targeting one of our servicing branches. Please consider updating the version.
description: Comment on vs* branches
onFailure:
onSuccess:
18 changes: 5 additions & 13 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<PropertyGroup>
<Product>Microsoft® Build Tools®</Product>
<Configurations>Debug;Release;Debug-MONO;Release-MONO;MachineIndependent</Configurations>
<Configurations>Debug;Release;MachineIndependent</Configurations>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -25,7 +25,10 @@
src/Framework/README.md
src/Utilities/README.md
-->
<LatestDotNetCoreForMSBuild>$(NetCurrent)</LatestDotNetCoreForMSBuild>
<!-- When building in source-only modes, let the TFM float based on what arcade is in use.
When building in normal modes (independent build or a dotnet product build), set explicitly. -->
<LatestDotNetCoreForMSBuild>net8.0</LatestDotNetCoreForMSBuild>
<LatestDotNetCoreForMSBuild Condition="'$(DotNetBuildFromSource)' == 'true' or '$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</LatestDotNetCoreForMSBuild>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -57,17 +60,6 @@
<NoWarn>$(NoWarn);NU1507;NU1603;NU5105;1701;1702;SYSLIB0011;SYSLIB0037;SYSLIB0044;RS0016;RS0017;</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Debug-MONO'">
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
<Optimize Condition="'$(Optimize)' == ''">false</Optimize>
<DefineConstants>$(DefineConstants);DEBUG</DefineConstants>
<MonoBuild>true</MonoBuild>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release-MONO'">
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
<Optimize Condition="'$(Optimize)' == ''">true</Optimize>
<MonoBuild>true</MonoBuild>
</PropertyGroup>
<!-- Configuration MSBuild for portable (xcopy-install) toolsets: works on WinNT and linux/mac via Mono, isolates from machine environment:
uses only tools installed with it, ignores Registry and GAC and Visual Studio installations to provide the same build experience on all machines -->
<PropertyGroup Condition="'$(Configuration)' == 'MachineIndependent'">
Expand Down
9 changes: 9 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,13 @@
<RemoveDir Directories="$(_PackageFolderInGlobalPackages)"
Condition="Exists('$(_PackageFolderInGlobalPackages)')" />
</Target>

<!-- Make APICompat use roslyn from the toolset SDK instead of from the toolset package. This avoids unification issues on desktop msbuild.
TODO: Remove when a 8.0.200 or 9.0 SDK is consumed. -->
<Target Name="FixAPICompatWorkAroundRoslynMove" AfterTargets="CollectApiCompatInputs">
<PropertyGroup>
<RoslynAssembliesPath>$(RoslynTargetsPath)</RoslynAssembliesPath>
</PropertyGroup>
</Target>

</Project>
Loading

0 comments on commit ab5267f

Please sign in to comment.