Skip to content

Commit

Permalink
Merge pull request #636 from mono/develop
Browse files Browse the repository at this point in the history
πŸš€πŸš€πŸš€ bump mdoc to 5.8.9.1
  • Loading branch information
huangmin-ms authored Jun 1, 2022
2 parents 8adc14d + ab41352 commit 7bead46
Show file tree
Hide file tree
Showing 6 changed files with 387 additions and 5 deletions.
109 changes: 109 additions & 0 deletions Mdoc-ReleaseCheckCI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
# Starter pipeline
# Start with a minimal pipeline that you can customize to build and deploy your code.
# Add steps that build, run tests, deploy, and more:
# https://aka.ms/yaml

trigger: none
pr:
- main

# Variable 'needRunReleaseMdoc' was defined in the Variables tab
# Variable 'params' was defined in the Variables tab
# 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
variables:
solution: 'apidoctools.sln'
buildConfiguration: 'Release'
buildPlatform: 'any cpu'
name: $(date:yyyyMMdd)$(rev:.r)
resources:
repositories:
- repository: self
type: git
ref: refs/heads/develop
jobs:
- job: Job_1
displayName: Agent job 1
timeoutInMinutes: 600
pool:
name: Azure Pipelines
vmImage: windows-2022
steps:
- checkout: self
clean: true
- task: AzureKeyVault@2
displayName: 'Azure Key Vault: ReferenceAutomation-Prod'
inputs:
ConnectedServiceName: 886728b9-fc93-486c-ba21-26777bea99af
KeyVaultName: ReferenceAutomation-Prod
enabled: true
- task: NuGetAuthenticate@0
displayName: NuGet Authenticate
- task: PowerShell@2
displayName: Compare xml files
timeoutInMinutes: 600
inputs:
filePath: mdoc/compareXmlFiles.ps1
arguments: -paramsJson '$(params)' -githubTokenBase64 '$(githubTokenBase64)' -githubOptionsAccountName $(githubOptionsAccountName) -githubOptionsAccountEmail $(githubOptionsAccountEmail) -vstsTokenBase64 '$(vstsTokenBase64)' -step '1' -commit1 ''
enabled: true
name: job1output
- job: Job_2
displayName: Agent job2
timeoutInMinutes: 600
dependsOn: Job_1
variables:
commit1: $[ dependencies.Job_1.outputs['job1output.commit1'] ]
pool:
name: Azure Pipelines
vmImage: windows-2022
steps:
- checkout: self
clean: true
- task: AzureKeyVault@2
displayName: 'Azure Key Vault: ReferenceAutomation-Prod'
inputs:
ConnectedServiceName: 886728b9-fc93-486c-ba21-26777bea99af
KeyVaultName: ReferenceAutomation-Prod
enabled: true
- task: NuGetToolInstaller@0
displayName: Use NuGet 4.4.1
inputs:
versionSpec: 4.4.1
enabled: true
- task: NuGetCommand@2
displayName: NuGet restore
inputs:
solution: $(BuildParameters.solution)
enabled: true
- task: CmdLine@2
displayName: Command Line Script
inputs:
script: make prepare
enabled: true
- task: VSBuild@1
displayName: Build solution
inputs:
solution: $(solution)
msbuildArgs: /p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactstagingdirectory)\\"
platform: $(BuildPlatform)
configuration: $(BuildConfiguration)
enabled: true
- task: NuGetAuthenticate@0
displayName: NuGet Authenticate
- task: PowerShell@2
displayName: Compare xml files
timeoutInMinutes: 600
inputs:
filePath: mdoc/compareXmlFiles.ps1
arguments: -paramsJson '$(params)' -githubTokenBase64 '$(githubTokenBase64)' -githubOptionsAccountName $(githubOptionsAccountName) -githubOptionsAccountEmail $(githubOptionsAccountEmail) -vstsTokenBase64 '$(vstsTokenBase64)' -step '2' -commit1 '$(commit1)'
enabled: true
name: job2output
- task: PowerShell@2
displayName: Print Compare Url
inputs:
targetType: inline
script: >-
# Write your PowerShell commands here.
Write-Host "Compare Url: $Env:CompareUrl"
...
2 changes: 1 addition & 1 deletion mdoc/Consts.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Mono.Documentation
{
public static class Consts
{
public static string MonoVersion = "5.8.9";
public static string MonoVersion = "5.8.9.1";
public const string DocId = "DocId";
public const string CppCli = "C++ CLI";
public const string CppCx = "C++ CX";
Expand Down
4 changes: 2 additions & 2 deletions mdoc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ check-monodocer-attached-entities:

# now make sure it will delete a previously run/duplicated attachedproperty/property
cp Test/AttachedEventsAndProperties/AttachedPropertyExample.xml Test/en.actual/AttachedEventsAndProperties/
$(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
$(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
$(DIFF) Test/en.expected-attached-entities Test/en.actual

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

.PHONY: check-monodocer-operators
check-monodocer-operators: check-monodocer-operators-work
Expand Down
4 changes: 3 additions & 1 deletion mdoc/Mono.Documentation/MDocUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1939,9 +1939,11 @@ void DeleteMember (string reason, string output, XmlNode member, MyXmlNodeList t
signature);

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

bool unifiedRun = HasDroppedNamespace (type);

Expand Down
Loading

0 comments on commit 7bead46

Please sign in to comment.