diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 83f716d75..d17e1acbc 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -33,7 +33,7 @@ jobs: - name: Build run: dotnet build --no-restore --verbosity normal - name: Pack - run: dotnet pack --no-build -p:PackageVersion=3.0.0-beta3 + run: dotnet pack --no-build -p:PackageVersion=3.0.0-beta0003 - name: Upload uses: actions/upload-artifact@v3 with: diff --git a/GitVersion.yml b/GitVersion.yml index dc39b1b4b..37e9b8a44 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,10 +1,5 @@ mode: ContinuousDeployment next-version: 3.0.0 -branches: - release: - regex: ^release?[/-] - tag: beta - increment: None - is-release-branch: true +branches: {} ignore: sha: [] diff --git a/README.md b/README.md index 458061eb5..d8eb81e8c 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ Open XML SDK > NOTICE: > -> [v3.0.0 beta 1](https://www.nuget.org/packages/DocumentFormat.OpenXml/3.0.0-ci0083) refactors and addresses some technical debt, with the goal to retain (as much as possible) source compatibility. We hope to maintain things such that you can update your package and recompile with limited changes. However, binary compatibility is not a goal and will break that for some changes which we plan on keeping documented. PRs that introduce such changes are marked with a `breaking-change` label and are added to a list to help migrating to v3.0.0. +> [v3.0.0 beta 3](https://www.nuget.org/packages/DocumentFormat.OpenXml/3.0.0-beta0003) refactors and addresses some technical debt, with the goal to retain (as much as possible) source compatibility. We hope to maintain things such that you can update your package and recompile with limited changes. However, binary compatibility is not a goal and will break that for some changes which we plan on keeping documented. PRs that introduce such changes are marked with a `breaking-change` label and are added to a list to help migrating to v3.0.0. > -> Please see the [v3.0.0 milestone](https://github.com/OfficeDev/Open-XML-SDK/milestone/1) for issues and PRs that are included in this change. For discussions about this change, please join us at [this issue](https://github.com/OfficeDev/Open-XML-SDK/issues/1270). +> Please see the [v3.0.0 milestone](https://github.com/OfficeDev/Open-XML-SDK/milestone/1) for issues and PRs that are included. For discussions, please join us at [this issue](https://github.com/OfficeDev/Open-XML-SDK/issues/1270). [![Downloads](https://img.shields.io/nuget/dt/DocumentFormat.OpenXml.svg)](https://www.nuget.org/packages/DocumentFormat.OpenXml) @@ -78,7 +78,7 @@ For details on platform support, including other runtimes such as Mono and Unity # Documentation -The functionality of the specific classes in this version of the Open XML SDK is similar to version 2.5, therefore the [Open XML SDK 2.5 for Office](http://msdn.microsoft.com/en-us/library/office/bb448854.aspx) documentation available on MSDN is still accurate. +The functionality of the specific classes in this version of the Open XML SDK is similar to version 2.5, therefore the [Open XML SDK 2.5 for Office](https://learn.microsoft.com/en-us/office/open-xml/open-xml-sdk) documentation available on Microsoft Learn still applies. In addition to open sourcing of the SDK, Microsoft has opened up the conceptual documentation for public review / contributions. A copy of the documentation is available for you to edit and review [in GitHub](https://github.com/OfficeDev/office-content). diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml deleted file mode 100644 index 86a03a0a3..000000000 --- a/build/azure-pipelines.yml +++ /dev/null @@ -1,64 +0,0 @@ -trigger: -- main -- release/* - -pr: - autoCancel: true - branches: - include: - - main - - release/* - paths: - exclude: - - /docs/ - - /*.md - -variables: - RunPeVerify: true - -stages: - - stage: Build - jobs: - - template: package.yml - - template: build.yml - parameters: - buildTargets: - - name: net35 - vmImages: - - image: 'windows-latest' - name: 'windows' - - name: net40 - vmImages: - - image: 'windows-latest' - name: 'windows' - - name: net46 - vmImages: - - image: 'windows-latest' - name: 'windows' - - name: net6_0 - runtimes: - - 6.0.11 - vmImages: - - image: 'windows-latest' - name: 'windows' - - image: 'ubuntu-latest' - name: 'linux' - - name: net7_0 - vmImages: - - image: 'windows-latest' - name: 'windows' - - image: 'ubuntu-latest' - name: 'linux' - - - stage: Sign - dependsOn: Build - condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) - jobs: - - job: Sign - displayName: Sign assemblies and package - pool: - vmImage: 'windows-latest' - variables: - - group: OpenXML SDK DNF Signing Credentials - steps: - - template: sign.yml diff --git a/build/build.yml b/build/build.yml deleted file mode 100644 index 661f41f2a..000000000 --- a/build/build.yml +++ /dev/null @@ -1,42 +0,0 @@ -parameters: - buildTargets: [] - -jobs: -- ${{ each buildTarget in parameters.buildTargets }}: - - ${{ each vmImage in buildTarget.vmImages }}: - - job: ${{ buildTarget.name }}_${{ vmImage.name }} - pool: - vmImage: ${{ vmImage.image }} - strategy: - matrix: - debug: - buildConfiguration: debug - upload: false - ProjectLoadStyle: ${{ buildTarget.name }} - release: - buildConfiguration: release - upload: ${{ buildTarget.upload }} - ProjectLoadStyle: ${{ buildTarget.name }} - steps: - - task: UseDotNet@2 - displayName: 'Install global.json .NET Core SDK' - inputs: - packageType: 'sdk' - useGlobalJson: true - - - ${{ each runtime in buildTarget.runtimes }}: - - task: UseDotNet@2 - displayName: 'Install .NET Runtime ${{ runtime }}' - inputs: - packageType: 'runtime' - version: ${{ runtime }} - - - task: DotNetCoreCLI@2 - inputs: - command: 'build' - arguments: '-c $(buildConfiguration)' - - - task: DotNetCoreCLI@2 - inputs: - command: 'test' - arguments: '-c $(buildConfiguration)' diff --git a/build/package.yml b/build/package.yml deleted file mode 100644 index 2ff156882..000000000 --- a/build/package.yml +++ /dev/null @@ -1,66 +0,0 @@ -jobs: - - job: Pack - variables: - ProjectLoadStyle: All - Configuration: Release - pool: - vmImage: 'windows-latest' # Needed for PEVerify - steps: - - task: UseDotNet@2 - displayName: 'Install global.json SDK' - inputs: - packageType: 'sdk' - useGlobalJson: true - - - task: UseDotNet@2 - displayName: 'Install .NET 6 SDK for GitVersion' - inputs: - packageType: 'sdk' - version: 6.x - - - task: PowerShell@2 - displayName: 'Update version' - name: updateVersion - inputs: - targetType: 'inline' - script: | - dotnet tool install --global GitVersion.Tool - dotnet gitversion /output buildserver /nofetch - - - task: PowerShell@2 - displayName: Remove generated files for baseline - name: removeBaseline - inputs: - targetType: 'inline' - script: | - Remove-Item generated/ -Include *.g.cs -Recurse - - - task: PowerShell@2 - displayName: 'Create NuGet package' - name: createPackage - inputs: - targetType: 'inline' - script: | - dotnet pack -c $(Configuration) - - - task: PowerShell@2 - displayName: Validate generated files - name: validateGenerated - inputs: - targetType: 'inline' - script: | - git status - git diff - if(git status --porcelain -- .\generated){ - Write-Host "##vso[task.LogIssue type=error;]Generated files are not in sync" - exit 1 - } - - - task: CopyFiles@2 - inputs: - sourceFolder: 'bin\$(Configuration)\packages\shipping' - targetFolder: '$(Build.ArtifactStagingDirectory)/unsigned' - - - publish: '$(Build.ArtifactStagingDirectory)/unsigned' - artifact: unsigned - displayName: 'Upload Unsigned Packages' diff --git a/build/sign.yml b/build/sign.yml deleted file mode 100644 index ae4591146..000000000 --- a/build/sign.yml +++ /dev/null @@ -1,79 +0,0 @@ -steps: - - checkout: none - - - download: current - artifact: unsigned - - - pwsh: | - mkdir raw - cd raw - gci ..\*.nupkg | % { Expand-Archive $_ } - cd .. - gci -r - workingDirectory: '$(Pipeline.Workspace)/unsigned' - - - task: UseDotNet@2 - displayName: 'Use .NET SDK 6.x for DNF Signing' - inputs: - version: 6.x - - # Install the code signing tool - - task: DotNetCoreCLI@2 - inputs: - command: custom - custom: tool - arguments: install --tool-path . sign --version 0.9.0-beta.23127.3 - displayName: Install SignTool tool - - # Run the signing command - - pwsh: | - .\sign code azure-key-vault ` - '**\DocumentFormat.OpenXml*.dll' ` - --base-directory '$(Pipeline.Workspace)\unsigned\raw' ` - --publisher-name "Microsoft" ` - --description "DocumentFormat.OpenXml DLL Signing" ` - --description-url "https://github.com/dotnet/sign" ` - --azure-key-vault-tenant-id "$(SignTenantId)" ` - --azure-key-vault-client-id "$(SignClientId)" ` - --azure-key-vault-client-secret '$(SignClientSecret)' ` - --azure-key-vault-certificate "$(SignKeyVaultCertificate)" ` - --azure-key-vault-url "$(SignKeyVaultUrl)" - displayName: Sign packages - - - pwsh: | - gci -r CodeSignSummary | rm - gci -Directory | % { [IO.Compression.ZipFile]::CreateFromDirectory($_, "$_.nupkg") } - workingDirectory: '$(Pipeline.Workspace)/unsigned/raw' - - # Run the signing command - - pwsh: | - .\sign code azure-key-vault ` - '*.nupkg' ` - --base-directory '$(Pipeline.Workspace)\unsigned\raw' ` - --publisher-name "Microsoft" ` - --description "DocumentFormat.OpenXml DLL Signing" ` - --description-url "https://github.com/dotnet/sign" ` - --azure-key-vault-tenant-id "$(SignTenantId)" ` - --azure-key-vault-client-id "$(SignClientId)" ` - --azure-key-vault-client-secret '$(SignClientSecret)' ` - --azure-key-vault-certificate "$(SignKeyVaultCertificate)" ` - --azure-key-vault-url "$(SignKeyVaultUrl)" - displayName: Sign packages - - - task: CopyFiles@2 - inputs: - sourceFolder: '$(Pipeline.Workspace)/unsigned' - contents: '*.snupkg' - targetFolder: '$(Build.ArtifactStagingDirectory)' - - - task: CopyFiles@2 - inputs: - sourceFolder: '$(Pipeline.Workspace)/unsigned/raw' - contents: '*.nupkg' - targetFolder: '$(Build.ArtifactStagingDirectory)' - - - task: PublishBuildArtifacts@1 - displayName: 'Publish Signed' - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)' - artifactName: 'signed'