Skip to content

Commit 7bead46

Browse files
huangmin-mshuangmin-ms
authored
Merge pull request #636 from mono/develop
🚀🚀🚀 bump mdoc to 5.8.9.1
2 parents 8adc14d + ab41352 commit 7bead46

6 files changed

Lines changed: 387 additions & 5 deletions

File tree

‎Mdoc-ReleaseCheckCI.yml‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
# Starter pipeline
2+
# Start with a minimal pipeline that you can customize to build and deploy your code.
3+
# Add steps that build, run tests, deploy, and more:
4+
# https://aka.ms/yaml
5+
6+
trigger: none
7+
pr:
8+
- main
9+
10+
# Variable 'needRunReleaseMdoc' was defined in the Variables tab
11+
# Variable 'params' was defined in the Variables tab
12+
# Agent Queue 'Azure Pipelines' was used with unrecognized Agent Specification, vmImage property must be specified to determine image - https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml#software
13+
variables:
14+
solution: 'apidoctools.sln'
15+
buildConfiguration: 'Release'
16+
buildPlatform: 'any cpu'
17+
name: $(date:yyyyMMdd)$(rev:.r)
18+
resources:
19+
repositories:
20+
- repository: self
21+
type: git
22+
ref: refs/heads/develop
23+
jobs:
24+
- job: Job_1
25+
displayName: Agent job 1
26+
timeoutInMinutes: 600
27+
pool:
28+
name: Azure Pipelines
29+
vmImage: windows-2022
30+
steps:
31+
- checkout: self
32+
clean: true
33+
- task: AzureKeyVault@2
34+
displayName: 'Azure Key Vault: ReferenceAutomation-Prod'
35+
inputs:
36+
ConnectedServiceName: 886728b9-fc93-486c-ba21-26777bea99af
37+
KeyVaultName: ReferenceAutomation-Prod
38+
enabled: true
39+
- task: NuGetAuthenticate@0
40+
displayName: NuGet Authenticate
41+
- task: PowerShell@2
42+
displayName: Compare xml files
43+
timeoutInMinutes: 600
44+
inputs:
45+
filePath: mdoc/compareXmlFiles.ps1
46+
arguments: -paramsJson '$(params)' -githubTokenBase64 '$(githubTokenBase64)' -githubOptionsAccountName $(githubOptionsAccountName) -githubOptionsAccountEmail $(githubOptionsAccountEmail) -vstsTokenBase64 '$(vstsTokenBase64)' -step '1' -commit1 ''
47+
enabled: true
48+
name: job1output
49+
- job: Job_2
50+
displayName: Agent job2
51+
timeoutInMinutes: 600
52+
dependsOn: Job_1
53+
variables:
54+
commit1: $[ dependencies.Job_1.outputs['job1output.commit1'] ]
55+
pool:
56+
name: Azure Pipelines
57+
vmImage: windows-2022
58+
steps:
59+
- checkout: self
60+
clean: true
61+
- task: AzureKeyVault@2
62+
displayName: 'Azure Key Vault: ReferenceAutomation-Prod'
63+
inputs:
64+
ConnectedServiceName: 886728b9-fc93-486c-ba21-26777bea99af
65+
KeyVaultName: ReferenceAutomation-Prod
66+
enabled: true
67+
- task: NuGetToolInstaller@0
68+
displayName: Use NuGet 4.4.1
69+
inputs:
70+
versionSpec: 4.4.1
71+
enabled: true
72+
- task: NuGetCommand@2
73+
displayName: NuGet restore
74+
inputs:
75+
solution: $(BuildParameters.solution)
76+
enabled: true
77+
- task: CmdLine@2
78+
displayName: Command Line Script
79+
inputs:
80+
script: make prepare
81+
enabled: true
82+
- task: VSBuild@1
83+
displayName: Build solution
84+
inputs:
85+
solution: $(solution)
86+
msbuildArgs: /p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactstagingdirectory)\\"
87+
platform: $(BuildPlatform)
88+
configuration: $(BuildConfiguration)
89+
enabled: true
90+
- task: NuGetAuthenticate@0
91+
displayName: NuGet Authenticate
92+
- task: PowerShell@2
93+
displayName: Compare xml files
94+
timeoutInMinutes: 600
95+
inputs:
96+
filePath: mdoc/compareXmlFiles.ps1
97+
arguments: -paramsJson '$(params)' -githubTokenBase64 '$(githubTokenBase64)' -githubOptionsAccountName $(githubOptionsAccountName) -githubOptionsAccountEmail $(githubOptionsAccountEmail) -vstsTokenBase64 '$(vstsTokenBase64)' -step '2' -commit1 '$(commit1)'
98+
enabled: true
99+
name: job2output
100+
- task: PowerShell@2
101+
displayName: Print Compare Url
102+
inputs:
103+
targetType: inline
104+
script: >-
105+
# Write your PowerShell commands here.
106+
107+
108+
Write-Host "Compare Url: $Env:CompareUrl"
109+
...

‎mdoc/Consts.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ namespace Mono.Documentation
33
{
44
public static class Consts
55
{
6-
public static string MonoVersion = "5.8.9";
6+
public static string MonoVersion = "5.8.9.1";
77
public const string DocId = "DocId";
88
public const string CppCli = "C++ CLI";
99
public const string CppCx = "C++ CX";

‎mdoc/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ check-monodocer-attached-entities:
751751

752752
# now make sure it will delete a previously run/duplicated attachedproperty/property
753753
cp Test/AttachedEventsAndProperties/AttachedPropertyExample.xml Test/en.actual/AttachedEventsAndProperties/
754-
$(MONO) $(PROGRAM) update -o Test/en.actual Test/AttachedEventsAndProperties/bin/Release/AttachedEventsAndProperties.dll -lang docid -lang vb.net -lang fsharp -lang javascript -lang c++/cli -lang c++/cx -lang c++/winrt
754+
$(MONO) $(PROGRAM) update -o Test/en.actual Test/AttachedEventsAndProperties/bin/Release/AttachedEventsAndProperties.dll --delete -lang docid -lang vb.net -lang fsharp -lang javascript -lang c++/cli -lang c++/cx -lang c++/winrt
755755
$(DIFF) Test/en.expected-attached-entities Test/en.actual
756756

757757
Test/TestClass.dll:
@@ -765,7 +765,7 @@ check-monodocer-operators-work: Test/TestClass.dll
765765
rm -Rf Test/en.actual
766766
$(MONO) $(PROGRAM) update Test/TestClass.dll -o Test/en.actual
767767
cp mdoc.Test/SampleClasses/TestClass-OldOpSig.xml Test/en.actual/mdoc.Test.SampleClasses/TestClass.xml
768-
$(MONO) $(PROGRAM) update Test/TestClass.dll -o Test/en.actual
768+
$(MONO) $(PROGRAM) update Test/TestClass.dll -o Test/en.actual --delete
769769

770770
.PHONY: check-monodocer-operators
771771
check-monodocer-operators: check-monodocer-operators-work

‎mdoc/Mono.Documentation/MDocUpdater.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1939,9 +1939,11 @@ void DeleteMember (string reason, string output, XmlNode member, MyXmlNodeList t
19391939
signature);
19401940

19411941
// Identify all of the different states that could affect our decision to delete the member
1942+
bool duplicated = reason.Contains("Duplicate Member");
19421943
bool shouldPreserve = !string.IsNullOrWhiteSpace (PreserveTag);
19431944
bool hasContent = MemberDocsHaveUserContent (member);
1944-
bool shouldDelete = !shouldPreserve && (delete || !hasContent);
1945+
//When the member is NOT PRESERVED, the member has NO CONTENT or is DUPLICATED, then it should be deleted
1946+
bool shouldDelete = !shouldPreserve && (delete && (!hasContent || duplicated));
19451947

19461948
bool unifiedRun = HasDroppedNamespace (type);
19471949

0 commit comments

Comments
 (0)