Update .github/workflows/nuget-ci.yml

Updated files

.github/workflows/nuget-ci.yml

@@ -1,6 +1,5 @@
 on:
   push:
-    branches: [ master, develop ]
     tags:
     - "v[0-9]+.[0-9]+.[0-9]+"
 
@@ -9,7 +8,7 @@ env:
     PACKAGE_OWNER: ${{ github.repository_owner }}
     PACKAGE_NAME: AspNetCore.Identity.MongoDbCore.${{ env.PACKAGE_VERSION }}.nupkg
     PACKAGE_SOURCE: https://git.home.cuco.li/api/packages/${{ env.PACKAGE_OWNER }}/nuget/index.json
-    PACKAGE_TOKEN: ${{ github.token }}
+    PACKAGE_TOKEN: ${{ secrets.PACKAGE_PUSH_TOKEN }}
 
 jobs:
   build:
@@ -23,9 +22,7 @@ jobs:
     - name: Verify commit exists in origin/master
       run: |
         git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
-        git branch --remote --contains | grep origin/master
+        git branch --remote --contains | grep origin/master        
-    #- name: Set VERSION variable from tag
-    #  run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
     - name: Build
       run: dotnet build --configuration Release /p:Version=${{ env.PACKAGE_VERSION }}
     - name: Test
@@ -33,6 +30,4 @@ jobs:
     - name: Pack
       run: dotnet pack --configuration Release /p:Version=${{ env.PACKAGE_VERSION }} --no-build --output .
     - name: Push
-      run: dotnet nuget push ${{ env.PACKAGE_NAME }} --source ${{ env.PACKAGE_SOURCE }} --api-key ${GITHUB_TOKEN}
+      run: dotnet nuget push ${{ env.PACKAGE_NAME }} --source ${{ env.PACKAGE_SOURCE }} --api-key ${{ env.PACKAGE_TOKEN }}
-      env:
-        GITHUB_TOKEN: ${{ env.PACKAGE_TOKEN }}

AspNetCore.Identity.MongoDbCore.sln

@@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{EE14
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoIdentitySample.Mvc", "sample\MongoIdentitySample.Mvc\MongoIdentitySample.Mvc.csproj", "{B0F2EB41-D3DC-4A5B-A479-A1D2595CE620}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDbGenericRepository", "..\mongodb-generic-repository\MongoDbGenericRepository\MongoDbGenericRepository.csproj", "{B99D771B-ACBA-45FC-B634-4E2D71C651C2}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,10 +33,6 @@ Global
 		{B0F2EB41-D3DC-4A5B-A479-A1D2595CE620}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B0F2EB41-D3DC-4A5B-A479-A1D2595CE620}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0F2EB41-D3DC-4A5B-A479-A1D2595CE620}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B99D771B-ACBA-45FC-B634-4E2D71C651C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B99D771B-ACBA-45FC-B634-4E2D71C651C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B99D771B-ACBA-45FC-B634-4E2D71C651C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B99D771B-ACBA-45FC-B634-4E2D71C651C2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

NuGet.Config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+    <add key="UltimateCoder" value="https://git.custom-coding.net/api/packages/UltimateCoder/nuget/index.json" />
+  </packageSources>
+</configuration>

sample/MongoIdentitySample.Mvc/MongoIdentitySample.Mvc.csproj

@@ -18,6 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.10" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="MongoDbGenericRepository" Version="1.6.3" />
   </ItemGroup>
 
   <ItemGroup>

sample/MongoIdentitySample.Mvc/Views/Manage/DisplayRecoveryCodes.cshtml

@@ -13,9 +13,9 @@
         <dt>Codes:</dt>
         @foreach (var code in Model.Codes)
         {
-        <dd>
+            <dd>
-            <text>@code</text>
+                <text> @Html.Raw(code) </text>
-        </dd>
+            </dd>
         }
     </dl>
 </div>

src/AspNetCore.Identity.MongoDbCore.csproj

@@ -31,12 +31,9 @@
     <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="8.0.10" />
     <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.10" />
     <PackageReference Include="MongoDB.Driver" Version="3.0.0" />
+    <PackageReference Include="MongoDbGenericRepository" Version="1.6.3" />
   </ItemGroup>
-
+  
-  <ItemGroup>
-    <ProjectReference Include="..\..\mongodb-generic-repository\MongoDbGenericRepository\MongoDbGenericRepository.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Resources.Designer.cs">
       <DependentUpon>Resources.resx</DependentUpon>

test/AspNetCore.Identity.MongoDbCore.IntegrationTests/AspNetCore.Identity.MongoDbCore.IntegrationTests.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="MongoDB.Driver" Version="3.0.0" />
+    <PackageReference Include="MongoDbGenericRepository" Version="1.6.3" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="coverlet.msbuild" Version="6.0.2">
@@ -32,9 +33,5 @@
     <Content Include="appsettings*.json">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </Content>  
-  </ItemGroup>
+  </ItemGroup>  
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\mongodb-generic-repository\MongoDbGenericRepository\MongoDbGenericRepository.csproj" />
-  </ItemGroup>
 </Project>