Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ms-henglu authored Sep 29, 2022
2 parents 4e6097a + f429b60 commit 36364ed
Show file tree
Hide file tree
Showing 33 changed files with 404 additions and 1,358 deletions.
12 changes: 8 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
day: "sunday"
- package-ecosystem: "npm"
directory: "/src/generator"
schedule:
interval: "daily"
interval: "weekly"
day: "sunday"
- package-ecosystem: "npm"
directory: "/src/autorest.bicep"
schedule:
interval: "daily"
interval: "weekly"
day: "sunday"
- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
day: "sunday"
187 changes: 123 additions & 64 deletions .github/fabricbot.json
Original file line number Diff line number Diff line change
@@ -1,78 +1,137 @@
[
{
"taskType": "trigger",
"capabilityId": "AutoMerge",
"subCapability": "AutoMerge",
"version": "1.0",
"config": {
"label": "AutoMerge",
"minMinutesOpen": "5",
"taskName": "Automatically merge PRs with AutoMerge label",
"mergeType": "squash",
"deleteBranches": true,
"enforceDMPAsStatus": true,
"removeLabelOnPush": true,
"usePrDescriptionAsCommitMessage": true
}
},
{
"taskType": "trigger",
"capabilityId": "IssueResponder",
"subCapability": "PullRequestResponder",
"version": "1.0",
"config": {
"conditions": {
"operator": "and",
"operands": [
{
"name": "isAction",
"parameters": {
"action": "opened"
{
"version": "1.0",
"tasks": [
{
"taskType": "trigger",
"capabilityId": "AutoMerge",
"subCapability": "AutoMerge",
"version": "1.0",
"config": {
"taskName": "Auto merge PRs",
"label": "auto-merge",
"minMinutesOpen": "5",
"mergeType": "squash",
"deleteBranches": true,
"allowAutoMergeInstructionsWithoutLabel": false
}
},
{
"taskType": "trigger",
"capabilityId": "IssueResponder",
"subCapability": "PullRequestResponder",
"version": "1.0",
"config": {
"conditions": {
"operator": "and",
"operands": [
{
"name": "isAction",
"parameters": {
"action": "opened"
}
},
{
"name": "isActivitySender",
"parameters": {
"user": "github-actions[bot]"
}
},
{
"name": "titleContains",
"parameters": {
"titlePattern": "Update Generated Types"
}
}
]
},
"eventType": "pull_request",
"eventNames": [
"pull_request",
"issues",
"project_card"
],
"taskName": "Automatically approve type generation PRs sent by github-actions[bot]",
"actions": [
{
"name": "closeIssue",
"parameters": {}
},
{
"name": "isActivitySender",
"name": "reopenIssue",
"parameters": {}
},
{
"name": "addLabel",
"parameters": {
"user": "github-actions[bot]"
"label": "AutoMerge"
}
},
{
"name": "titleContains",
"name": "approvePullRequest",
"parameters": {
"titlePattern": "Update Generated Types"
"comment": "Automatically approving type generation pull request sent by @github-actions[bot]."
}
}
]
},
"eventType": "pull_request",
"eventNames": [
"pull_request",
"issues",
"project_card"
],
"taskName": "Automatically approve type generation PRs sent by github-actions[bot]",
"actions": [
{
"name": "closeIssue",
"parameters": {}
},
{
"name": "reopenIssue",
"parameters": {}
},
{
"name": "addLabel",
"parameters": {
"label": "AutoMerge"
}
}
},
{
"taskType": "trigger",
"capabilityId": "IssueResponder",
"subCapability": "PullRequestResponder",
"version": "1.0",
"config": {
"conditions": {
"operator": "and",
"operands": [
{
"name": "hasLabel",
"parameters": {
"label": "dependencies"
}
},
{
"operator": "not",
"operands": [
{
"name": "hasLabel",
"parameters": {
"label": "auto-merge"
}
}
]
},
{
"name": "isActivitySender",
"parameters": {
"user": "dependabot[bot]"
}
}
]
},
{
"name": "approvePullRequest",
"parameters": {
"comment": "Automatically approving type generation pull request sent by @github-actions[bot]."
"eventType": "pull_request",
"eventNames": [
"pull_request",
"issues",
"project_card"
],
"taskName": "Approve and apply \"auto-merge\" label to dependabot PRs",
"actions": [
{
"name": "approvePullRequest",
"parameters": {
"comment": ":shipit:"
}
},
{
"name": "addLabel",
"parameters": {
"label": "auto-merge"
}
}
}
]
]
}
}
}
]
],
"userGroups": []
}
12 changes: 0 additions & 12 deletions bicep-types-az.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bicep.Types", "src\Bicep.Types\Bicep.Types.csproj", "{0E40BC2B-98EE-457C-8E35-8FB548FF0E90}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bicep.Types.Az", "src\Bicep.Types.Az\Bicep.Types.Az.csproj", "{93159227-767E-4A3F-98A4-143FE6081198}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bicep.Types.UnitTests", "src\Bicep.Types.UnitTests\Bicep.Types.UnitTests.csproj", "{7518DD9B-42A8-4CFF-ABE8-992984521D42}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bicep.Types.Az.UnitTests", "src\Bicep.Types.Az.UnitTests\Bicep.Types.Az.UnitTests.csproj", "{F63447B8-2EC0-4C49-8E99-FF135275ECDF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{72C40400-136A-462C-B0A2-107A57E3092C}"
Expand All @@ -23,18 +19,10 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0E40BC2B-98EE-457C-8E35-8FB548FF0E90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0E40BC2B-98EE-457C-8E35-8FB548FF0E90}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0E40BC2B-98EE-457C-8E35-8FB548FF0E90}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0E40BC2B-98EE-457C-8E35-8FB548FF0E90}.Release|Any CPU.Build.0 = Release|Any CPU
{93159227-767E-4A3F-98A4-143FE6081198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{93159227-767E-4A3F-98A4-143FE6081198}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93159227-767E-4A3F-98A4-143FE6081198}.Release|Any CPU.ActiveCfg = Release|Any CPU
{93159227-767E-4A3F-98A4-143FE6081198}.Release|Any CPU.Build.0 = Release|Any CPU
{7518DD9B-42A8-4CFF-ABE8-992984521D42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7518DD9B-42A8-4CFF-ABE8-992984521D42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7518DD9B-42A8-4CFF-ABE8-992984521D42}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7518DD9B-42A8-4CFF-ABE8-992984521D42}.Release|Any CPU.Build.0 = Release|Any CPU
{F63447B8-2EC0-4C49-8E99-FF135275ECDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F63447B8-2EC0-4C49-8E99-FF135275ECDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F63447B8-2EC0-4C49-8E99-FF135275ECDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
26 changes: 14 additions & 12 deletions src/Bicep.Types.Az.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,17 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
"requested": "[3.5.109, )",
"resolved": "3.5.109",
"contentHash": "tKA1XJ5U2Ytk+u2/5sGNa04Pw6z9noYmqbpmHpjvbwJTtIalqsQjnwT4RQKSDTTIznHBbKxzv3HVh8QD28Qk+g=="
"requested": "[3.5.113, )",
"resolved": "3.5.113",
"contentHash": "4fBSMkqhi410qlkjPm+Mxfk8iO3C7dmgdVS7ljsfVO21WEzZCHP1VCOqB6rlOPfPidR/oxX+/Do/I7meCAz+Jg=="
},
"Azure.Bicep.Types": {
"type": "Transitive",
"resolved": "0.3.1",
"contentHash": "P/HUHAxPEQFP9hUohoPuy48eUyowL0dzNXFtKKIE+/EqQKObMATcQ7RjAcQrXaOIsYZ/Vk4gVreweJ3rkbYYJw==",
"dependencies": {
"System.Text.Json": "6.0.6"
}
},
"Microsoft.Build.Tasks.Git": {
"type": "Transitive",
Expand Down Expand Up @@ -131,23 +139,17 @@
},
"System.Text.Json": {
"type": "Transitive",
"resolved": "6.0.5",
"contentHash": "SSH+YYrMpvLcy7Orzb5K1tSyffnFacWahyxCCjYH1PbSHdAF4dekmIetBurFKgtTHDmwEe/J2Csi/7niRH6d/g==",
"resolved": "6.0.6",
"contentHash": "GZ+62pLOr544jwSvyXv5ezSfzlFBTjLuPhgOS2dnKuknAA8dPNUGXLKTHf9XdsudU9JpbtweXnE4oEiKEB2T1Q==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encodings.Web": "6.0.0"
}
},
"Azure.Bicep.Types": {
"type": "Project",
"dependencies": {
"System.Text.Json": "[6.0.5, )"
}
},
"Azure.Bicep.Types.Az": {
"type": "Project",
"dependencies": {
"Azure.Bicep.Types": "[1.0.0, )"
"Azure.Bicep.Types": "[0.3.1, )"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Bicep.Types.Az/Bicep.Types.Az.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="../Bicep.Types/Bicep.Types.csproj" />
<PackageReference Include="Azure.Bicep.Types" Version="0.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down
25 changes: 14 additions & 11 deletions src/Bicep.Types.Az/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
"version": 1,
"dependencies": {
".NETStandard,Version=v2.0": {
"Azure.Bicep.Types": {
"type": "Direct",
"requested": "[0.3.1, )",
"resolved": "0.3.1",
"contentHash": "P/HUHAxPEQFP9hUohoPuy48eUyowL0dzNXFtKKIE+/EqQKObMATcQ7RjAcQrXaOIsYZ/Vk4gVreweJ3rkbYYJw==",
"dependencies": {
"System.Text.Json": "6.0.6"
}
},
"Microsoft.SourceLink.GitHub": {
"type": "Direct",
"requested": "[1.1.1, )",
Expand All @@ -14,9 +23,9 @@
},
"Nerdbank.GitVersioning": {
"type": "Direct",
"requested": "[3.5.109, )",
"resolved": "3.5.109",
"contentHash": "tKA1XJ5U2Ytk+u2/5sGNa04Pw6z9noYmqbpmHpjvbwJTtIalqsQjnwT4RQKSDTTIznHBbKxzv3HVh8QD28Qk+g=="
"requested": "[3.5.113, )",
"resolved": "3.5.113",
"contentHash": "4fBSMkqhi410qlkjPm+Mxfk8iO3C7dmgdVS7ljsfVO21WEzZCHP1VCOqB6rlOPfPidR/oxX+/Do/I7meCAz+Jg=="
},
"NETStandard.Library": {
"type": "Direct",
Expand Down Expand Up @@ -87,8 +96,8 @@
},
"System.Text.Json": {
"type": "Transitive",
"resolved": "6.0.5",
"contentHash": "SSH+YYrMpvLcy7Orzb5K1tSyffnFacWahyxCCjYH1PbSHdAF4dekmIetBurFKgtTHDmwEe/J2Csi/7niRH6d/g==",
"resolved": "6.0.6",
"contentHash": "GZ+62pLOr544jwSvyXv5ezSfzlFBTjLuPhgOS2dnKuknAA8dPNUGXLKTHf9XdsudU9JpbtweXnE4oEiKEB2T1Q==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
"System.Buffers": "4.5.1",
Expand All @@ -106,12 +115,6 @@
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
}
},
"Azure.Bicep.Types": {
"type": "Project",
"dependencies": {
"System.Text.Json": "[6.0.5, )"
}
}
}
}
Expand Down
20 changes: 0 additions & 20 deletions src/Bicep.Types.UnitTests/Bicep.Types.UnitTests.csproj

This file was deleted.

Loading

0 comments on commit 36364ed

Please sign in to comment.