Skip to content

Commit 35b5282

Browse files
authored
Merge pull request #958 from microsoft/vnext
Release Libs v1.4.0-preview1
2 parents 67a6b07 + 2d8212e commit 35b5282

File tree

7 files changed

+14
-25
lines changed

7 files changed

+14
-25
lines changed

.azure-pipelines/ci-build.yml

+7-18
Original file line numberDiff line numberDiff line change
@@ -157,30 +157,18 @@ stages:
157157
}
158158
]
159159
SessionTimeout: 20
160-
160+
161161
# Pack
162-
- task: DotNetCoreCLI@2
162+
- pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
163163
displayName: 'pack OpenAPI'
164-
inputs:
165-
command: pack
166-
projects: src/Microsoft.OpenApi/Microsoft.OpenApi.csproj
167-
arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
168164

169165
# Pack
170-
- task: DotNetCoreCLI@2
166+
- pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
171167
displayName: 'pack Readers'
172-
inputs:
173-
command: pack
174-
projects: src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
175-
arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
176-
168+
177169
# Pack
178-
- task: DotNetCoreCLI@2
179-
displayName: 'pack Hidi'
180-
inputs:
181-
command: pack
182-
projects: src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
183-
arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
170+
- pwsh: dotnet pack $(Build.SourcesDirectory)/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj -o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg
171+
displayName: 'pack Hidi'
184172

185173
- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
186174
displayName: 'ESRP CodeSigning Nuget Packages'
@@ -290,6 +278,7 @@ stages:
290278
displayName: 'GitHub release (edit)'
291279
inputs:
292280
gitHubConnection: 'Github-MaggieKimani1'
281+
action: edit
293282
tagSource: userSpecifiedTag
294283
tag: '$(artifactVersion)'
295284
title: '$(artifactVersion)'

.github/workflows/docker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ jobs:
3030
id: getversion
3131
- name: Push to GitHub Packages - Nightly
3232
if: ${{ github.ref == 'refs/heads/vnext' }}
33-
uses: docker/build-push-action@v3.0.0
33+
uses: docker/build-push-action@v3.1.0
3434
with:
3535
push: true
3636
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly
3737
- name: Push to GitHub Packages - Release
3838
if: ${{ github.ref == 'refs/heads/master' }}
39-
uses: docker/build-push-action@v3.0.0
39+
uses: docker/build-push-action@v3.1.0
4040
with:
4141
push: true
4242
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}

src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
4343
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
4444
<PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
45-
<PackageReference Include="Microsoft.OData.Edm" Version="7.12.0" />
45+
<PackageReference Include="Microsoft.OData.Edm" Version="7.12.1" />
4646
<PackageReference Include="Microsoft.OpenApi.OData" Version="1.0.11" />
4747
</ItemGroup>
4848

src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Company>Microsoft</Company>
1111
<Title>Microsoft.OpenApi.Readers</Title>
1212
<PackageId>Microsoft.OpenApi.Readers</PackageId>
13-
<Version>1.3.2</Version>
13+
<Version>1.4.0-preview1</Version>
1414
<Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
1515
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
1616
<PackageTags>OpenAPI .NET</PackageTags>

src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.330701">
10+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
1111
<PrivateAssets>all</PrivateAssets>
1212
</PackageReference>
1313
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />

src/Microsoft.OpenApi/Microsoft.OpenApi.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Company>Microsoft</Company>
1212
<Title>Microsoft.OpenApi</Title>
1313
<PackageId>Microsoft.OpenApi</PackageId>
14-
<Version>1.3.2</Version>
14+
<Version>1.4.0-preview1</Version>
1515
<Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
1616
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
1717
<PackageTags>OpenAPI .NET</PackageTags>

test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageReference Include="Moq" Version="4.18.1" />
2121
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2222
<PackageReference Include="SharpYaml" Version="2.0.0" />
23-
<PackageReference Include="Verify.Xunit" Version="17.2.1" />
23+
<PackageReference Include="Verify.Xunit" Version="17.4.2" />
2424
<PackageReference Include="xunit" Version="2.4.1" />
2525
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
2626
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)