Merge pull request #824 from microsoft/release/1.3.1-preview6

Update master with Release/1.3.1 preview6

Author: darrelmiller

.azure-pipelines/ci-build.yml

@@ -270,11 +270,11 @@ stages:
               inputs:
                 source: current
             - pwsh: |
-                $artifactMainDirectory = Get-ChildItem -Filter Microsoft.OpenApi.Hidi-* -Directory -Recurse | select -First 1
-                $artifactName = $artifactMainDirectory.Name -replace "Microsoft.OpenApi.Hidi-", ""
-                #Set Variable $artifactName
-                Write-Host "##vso[task.setvariable variable=artifactName; isSecret=false; isOutput=true;]$artifactName"
-                Write-Host "##vso[task.setvariable variable=artifactMainDirectory; isSecret=false; isOutput=true;]$artifactMainDirectory"
+                $artifactName = Get-ChildItem -Path $(Pipeline.Workspace) -Filter Microsoft.OpenApi.Hidi-* -recurse | select -First 1
+                $artifactVersion= $artifactName -replace "Microsoft.OpenApi.Hidi-", ""
+                #Set Variable $artifactName and $artifactVersion
+                Write-Host "##vso[task.setvariable variable=artifactVersion; isSecret=false; isOutput=true]$artifactVersion"
+                Write-Host "##vso[task.setvariable variable=artifactName; isSecret=false; isOutput=true]$artifactName.FullName"
               displayName: 'Fetch Artifact Name'
 
             - task: NuGetCommand@2
@@ -289,10 +289,10 @@ stages:
               inputs:
                 gitHubConnection: 'Github-MaggieKimani1'
                 tagSource: userSpecifiedTag
-                tag: '$(artifactName)'
+                tag: '$(artifactVersion)'
                 title: '$(artifactName)'
                 releaseNotesSource: inline
-                assets: '$(artifactMainDirectory)\**\*.exe'
+                assets: '$(Pipeline.Workspace)\**\*.exe'
                 changeLogType: issueBased
 
     - deployment: deploy_lib

.github/workflows/ci-cd.yml

@@ -41,7 +41,7 @@ jobs:
 
       - name: Checkout repository
         id: checkout_repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0

.github/workflows/codeql-analysis.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Checkout repository
         id: checkout_repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v2

src/Microsoft.OpenApi.Hidi/CsdlFilter.xslt

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:edm="http://docs.oasis-open.org/odata/ns/edm"
+    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl"
+>
+    <xsl:output method="xml" indent="yes"/>
+
+    <xsl:param name="entitySetOrSingleton" select="'serviceappointments'"></xsl:param>
+    
+    <xsl:template match="edm:EntityContainer">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | edm:EntitySet[contains($entitySetOrSingleton,@Name)] | edm:Singleton[contains($entitySetOrSingleton,@Name)]"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="@* | node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()"/>
+        </xsl:copy>
+    </xsl:template>
+
+</xsl:stylesheet>

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

@@ -15,7 +15,7 @@
     <PackageId>Microsoft.OpenApi.Hidi</PackageId>
     <ToolCommandName>hidi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>0.5.0-preview5</Version>
+    <Version>0.5.0-preview6</Version>
     <Description>OpenAPI.NET CLI tool for slicing OpenAPI documents</Description>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>OpenAPI .NET</PackageTags>
@@ -31,14 +31,22 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="CsdlFilter.xslt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="CsdlFilter.xslt" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta2.21617.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="7.10.0" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.0.10-preview2" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="1.0.10-preview3" />
   </ItemGroup>
 
   <ItemGroup>