Merge pull request #65 from AutoMapper/UpdateExpressionMapperToLatest…

…Preview v.latest from AutoMapper.Extensions.ExpressionMapping
AutoMapper · Oct 26, 2020 · 2ae5fc3 · 2ae5fc3
2 parents cbcb9fd + 289bed4
commit 2ae5fc3
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,10 +18,10 @@ jobs:
 
     - name: Set Variables
       run: |
-        echo '::set-env name=DEPLOY_PACKAGE_URL::https://www.myget.org/F/automapperdev/api/v3/index.json'
-        echo '::set-env name=DEPLOY_PACKAGE_API_KEY::${{ secrets.MYGET_CI_API_KEY }}'
-        echo '::set-env name=REPO::${{ github.repository }}'
-        echo '::set-env name=REPO_OWNER::${{ github.repository_owner }}'
+        echo "DEPLOY_PACKAGE_URL=https://www.myget.org/F/automapperdev/api/v3/index.json" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        echo "DEPLOY_PACKAGE_API_KEY=${{ secrets.MYGET_CI_API_KEY }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        echo "REPO=${{ github.repository }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        echo "REPO_OWNER=${{ github.repository_owner }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
 
     - name: Restore
       run: dotnet restore
@@ -32,17 +32,20 @@ jobs:
     - name: Test
       run: dotnet test --no-restore --verbosity normal
 
-    - run: echo '::set-env name=PROJECT_NAME::AutoMapper.AspNetCore.OData.EFCore'
-    - name: Pack and push
+    - name: Pack and push AutoMapper.AspNetCore.OData.EFCore
+      env:
+        PROJECT_NAME: AutoMapper.AspNetCore.OData.EFCore
       run: ./Pack_Push.ps1
       shell: pwsh
 
-    - run: echo '::set-env name=PROJECT_NAME::AutoMapper.AspNet.OData.EF6'
-    - name: Pack and push
+    - name: Pack and push AutoMapper.AspNet.OData.EF6
+      env:
+        PROJECT_NAME: AutoMapper.AspNet.OData.EF6
       run: ./Pack_Push.ps1
       shell: pwsh
 
-    - run: echo '::set-env name=PROJECT_NAME::AutoMapper.AspNetCore.OData.EF6'
-    - name: Pack and push
+    - name: Pack and push AutoMapper.AspNetCore.OData.EF6
+      env:
+        PROJECT_NAME: AutoMapper.AspNetCore.OData.EF6
       run: ./Pack_Push.ps1
       shell: pwsh
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,10 +16,10 @@ jobs:
 
     - name: Set Variables
       run: |
-        echo '::set-env name=DEPLOY_PACKAGE_URL::https://api.nuget.org/v3/index.json'
-        echo '::set-env name=DEPLOY_PACKAGE_API_KEY::${{ secrets.NUGET_API_KEY }}'
-        echo '::set-env name=REPO::${{ github.repository }}'
-        echo '::set-env name=REPO_OWNER::${{ github.repository_owner }}'
+        echo "DEPLOY_PACKAGE_URL=https://api.nuget.org/v3/index.json" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        echo "DEPLOY_PACKAGE_API_KEY=${{ secrets.NUGET_API_KEY }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        echo "REPO=${{ github.repository }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
+        echo "REPO_OWNER=${{ github.repository_owner }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
 
     - name: Restore
       run: dotnet restore
@@ -30,17 +30,20 @@ jobs:
     - name: Test
       run: dotnet test --no-restore --verbosity normal
 
-    - run: echo '::set-env name=PROJECT_NAME::AutoMapper.AspNetCore.OData.EFCore'
-    - name: Pack and push
+    - name: Pack and push AutoMapper.AspNetCore.OData.EFCore
+      env:
+        PROJECT_NAME: AutoMapper.AspNetCore.OData.EFCore
       run: ./Pack_Push.ps1
       shell: pwsh
 
-    - run: echo '::set-env name=PROJECT_NAME::AutoMapper.AspNet.OData.EF6'
-    - name: Pack and push
+    - name: Pack and push AutoMapper.AspNet.OData.EF6
+      env:
+        PROJECT_NAME: AutoMapper.AspNet.OData.EF6
       run: ./Pack_Push.ps1
       shell: pwsh
 
-    - run: echo '::set-env name=PROJECT_NAME::AutoMapper.AspNetCore.OData.EF6'
-    - name: Pack and push
+    - name: Pack and push AutoMapper.AspNetCore.OData.EF6
+      env:
+        PROJECT_NAME: AutoMapper.AspNetCore.OData.EF6
       run: ./Pack_Push.ps1
       shell: pwsh
diff --git a/AutoMapper.AspNet.OData.EF6/AutoMapper.AspNet.OData.EF6.csproj b/AutoMapper.AspNet.OData.EF6/AutoMapper.AspNet.OData.EF6.csproj
@@ -6,7 +6,7 @@
     <PackageId>AutoMapper.AspNet.OData.EF6</PackageId>
     <Description>Creates LINQ expressions from ODataQueryOptions and executes the query.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>Adding filtering and sorting for child collections.</PackageReleaseNotes>
+    <PackageReleaseNotes>Incorporating v.latest from AutoMapper.Extensions.ExpressionMapping</PackageReleaseNotes>
     <PackageTags>linq expressions odata ef</PackageTags>
     <PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/AutoMapper/AutoMapper.Extensions.OData</RepositoryUrl>
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.0.2-preview-3,5.0.0)" />
+    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.0.2,5.0.0)" />
     <PackageReference Include="EntityFramework" Version="6.2.0" />
     <PackageReference Include="LogicBuilder.Expressions.Utils" Version="4.0.2" />
     <PackageReference Include="Microsoft.AspNet.OData" Version="7.4.1" />

diff --git a/AutoMapper.AspNetCore.OData.EF6/AutoMapper.AspNetCore.OData.EF6.csproj b/AutoMapper.AspNetCore.OData.EF6/AutoMapper.AspNetCore.OData.EF6.csproj
@@ -6,7 +6,7 @@
     <PackageId>AutoMapper.AspNetCore.OData.EF6</PackageId>
     <Description>Creates LINQ expressions from ODataQueryOptions and executes the query.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>Adding filtering and sorting for child collections.</PackageReleaseNotes>
+    <PackageReleaseNotes>Incorporating v.latest from AutoMapper.Extensions.ExpressionMapping</PackageReleaseNotes>
     <PackageTags>linq expressions odata efcore</PackageTags>
     <PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/AutoMapper/AutoMapper.Extensions.OData</RepositoryUrl>
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.0.2-preview-3,5.0.0)" />
+    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.0.2,5.0.0)" />
     <PackageReference Include="EntityFramework" Version="6.2.0" />
     <PackageReference Include="LogicBuilder.Expressions.Utils" Version="4.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.OData" Version="7.4.1" />

diff --git a/AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj b/AutoMapper.AspNetCore.OData.EFCore/AutoMapper.AspNetCore.OData.EFCore.csproj
@@ -6,7 +6,7 @@
     <PackageId>AutoMapper.AspNetCore.OData.EFCore</PackageId>
     <Description>Creates LINQ expressions from ODataQueryOptions and executes the query.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>Adding filtering and sorting for child collections.</PackageReleaseNotes>
+    <PackageReleaseNotes>Incorporating v.latest from AutoMapper.Extensions.ExpressionMapping</PackageReleaseNotes>
     <PackageTags>linq expressions odata efcore</PackageTags>
     <PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/AutoMapper/AutoMapper.Extensions.OData</RepositoryUrl>
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.0.2-preview-3,5.0.0)" />
+    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="[4.0.2,5.0.0)" />
     <PackageReference Include="LogicBuilder.Expressions.Utils" Version="4.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.OData" Version="7.4.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />

diff --git a/WebAPI.AspNet.OData.EF6/Web.config b/WebAPI.AspNet.OData.EF6/Web.config
@@ -42,7 +42,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="AutoMapper.Extensions.ExpressionMapping" publicKeyToken="be96cd2c38ef1005" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.AspNet.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />

diff --git a/WebAPI.AspNet.OData.EF6/WebAPI.AspNet.OData.EF6.csproj b/WebAPI.AspNet.OData.EF6/WebAPI.AspNet.OData.EF6.csproj
@@ -47,10 +47,10 @@
       <HintPath>..\packages\AutoMapper.10.0.0\lib\net461\AutoMapper.dll</HintPath>
     </Reference>
     <Reference Include="AutoMapper.AspNet.OData.EF6, Version=2.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.AspNet.OData.EF6.2.0.2-preview.0\lib\net461\AutoMapper.AspNet.OData.EF6.dll</HintPath>
+      <HintPath>..\packages\AutoMapper.AspNet.OData.EF6.2.0.2-preview.1.1\lib\net461\AutoMapper.AspNet.OData.EF6.dll</HintPath>
     </Reference>
-    <Reference Include="AutoMapper.Extensions.ExpressionMapping, Version=4.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.Extensions.ExpressionMapping.4.0.2-preview-3\lib\net461\AutoMapper.Extensions.ExpressionMapping.dll</HintPath>
+    <Reference Include="AutoMapper.Extensions.ExpressionMapping, Version=4.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.Extensions.ExpressionMapping.4.0.2\lib\net461\AutoMapper.Extensions.ExpressionMapping.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>

diff --git a/WebAPI.AspNet.OData.EF6/packages.config b/WebAPI.AspNet.OData.EF6/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="10.0.0" targetFramework="net472" />
-  <package id="AutoMapper.AspNet.OData.EF6" version="2.0.2-preview.0" targetFramework="net472" />
-  <package id="AutoMapper.Extensions.ExpressionMapping" version="4.0.2-preview-3" targetFramework="net472" />
+  <package id="AutoMapper.AspNet.OData.EF6" version="2.0.2-preview.1.1" targetFramework="net472" />
+  <package id="AutoMapper.Extensions.ExpressionMapping" version="4.0.2" targetFramework="net472" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net472" />
   <package id="LogicBuilder.Expressions.Utils" version="4.0.2" targetFramework="net472" />
   <package id="LogicBuilder.Structures" version="4.0.2" targetFramework="net472" />

diff --git a/WebAPI.OData.EFCore/WebAPI.OData.EFCore.csproj b/WebAPI.OData.EFCore/WebAPI.OData.EFCore.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AutoMapper.AspNetCore.OData.EFCore" Version="2.0.2-preview.0" />
-    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="4.0.2-preview-3" />
+    <PackageReference Include="AutoMapper.AspNetCore.OData.EFCore" Version="2.0.2-preview.1.1" />
+    <PackageReference Include="AutoMapper.Extensions.ExpressionMapping" Version="4.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.OData" Version="7.4.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />