Skip to content

Commit 6cf3e5a

Browse files
toniarnoldtoniarnold
committed
Add api.core.nuget.sln to the build
The solution api.core.nuget.sln pull the asplib dependency from the .nuget package just built before, serving as a smoke test for the package itself.
1 parent 5a6d2da commit 6cf3e5a

File tree

12 files changed

+334
-9
lines changed

12 files changed

+334
-9
lines changed

‎.github/workflows/libs-build.yml

+33-4
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,56 @@ jobs:
1919
with:
2020
dotnet-version: 6.0.x
2121

22+
# Build libs.core
2223
- name: Restore dependencies
2324
run: dotnet restore libs.core.sln
2425
- name: Add msbuild to PATH
2526
uses: microsoft/[email protected]
2627
- name: Build .NET Core libraries
2728
run: msbuild libs.core.sln -property:noSmc=true,Configuration=Release
2829

30+
# Test libs.core with SQL and create nuGet packages
2931
- name: Install SQL Server
3032
uses: Particular/[email protected]
3133
with:
3234
connection-string-env-var: ASP_DBEntities
3335
catalog: ASP_DB
34-
- name: Create schemas
36+
- name: Create [Main] table
3537
shell: pwsh
3638
run: sqlcmd -i ${{ github.workspace }}/src/asp.db/dbo/Tables/Main.sql -d "ASP_DB"
37-
- name: Test
39+
- name: Test libs
3840
run: dotnet test libs.core.sln --configuration Release --no-restore --no-build --verbosity normal
3941

40-
- name: Create packages
42+
- name: Create .nupkg packages
4143
run: dotnet pack libs.core.sln -property:noSmc=true --configuration Release --no-restore -o ${{ github.workspace }}/packages
42-
- name: Upload .nupkg
44+
45+
# Use the new asplib.core package to build and test apiservice
46+
- name: Create [Accesscode] table
47+
shell: pwsh
48+
run: |
49+
sqlcmd -i ${{ github.workspace }}/src/apiservice.db/dbo/Tables/Accesscode.sql -d "ASP_DB"
50+
sqlcmd -i ${{ github.workspace }}/src/apiservice.db/Scripts/Insert.Main.Accesscode.sql -d "ASP_DB"
51+
- name: Create local NuGet.Config
52+
shell: pwsh
53+
run: >
54+
@('<configuration>',
55+
' <packageSources>',
56+
' <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />',
57+
' <add key="action-local" value="${{ github.workspace }}/packages/" />',
58+
' </packageSources>',
59+
'</configuration>'
60+
) | Set-Content -Path '${{ github.workspace }}/NuGet.Config'
61+
- name: Restore dependencies from above local source
62+
run: dotnet restore api.core.nuget.sln
63+
- name: Build api with local asplib.core package
64+
run: msbuild api.core.nuget.sln -property:noSmc=true,Configuration=Release
65+
- name: Test api
66+
run: dotnet test api.core.nuget.sln --configuration Release --no-restore --no-build --verbosity normal
67+
env:
68+
"ConnectionStrings:ApiserviceDb": "${{ env.ASP_DBEntities }}"
69+
70+
# Upload the packages when above smoke test was green
71+
- name: Upload .nupkg packages
4372
uses: actions/upload-artifact@v3
4473
with:
4574
name: libs.core

‎.github/workflows/sandbox.yml

+41-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,50 @@ jobs:
77
try:
88
runs-on: windows-latest
99
steps:
10+
- name: Set the value
11+
id: step_one
12+
run: |
13+
echo "action_state=yellow" >> $env:GITHUB_ENV
14+
- name: Use the value
15+
id: step_two
16+
run: |
17+
echo "${{ env.action_state }}" # This will output 'yellow'
18+
- name: Set github environment variable
19+
run: echo "UMGEB=aword" >> $GITHUB_ENV
20+
- name: Read github environment variables
21+
run: echo "${{ env.action_state }}"
22+
- name: Read environment variables
23+
run: "Get-Item -Path Env:"
24+
- name: Set pwsh environment variable
25+
shell: pwsh
26+
run: "[System.Environment]::SetEnvironmentVariable('PWSH_Environ','Powershell-Value')"
1027
- name: Write nuget.config
1128
shell: pwsh
1229
run: >
13-
@('<packageSources>', ' <add key="action" value="${{github.workspace}}/packages/" />', '</packageSources>')
14-
| Set-Content -Path '${{github.workspace}}/nuget.config'
30+
@('<configuration>',
31+
' <packageSources>',
32+
' <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />',
33+
' <add key="action-local" value="${{ github.workspace }}/packages/" />',
34+
' </packageSources>',
35+
'</configuration>'
36+
) | Set-Content -Path '${{ github.workspace }}/NuGet.Config'
1537
- name: Read nuget.config
1638
shell: pwsh
1739
run: >
18-
Get-Content '${{github.workspace}}/nuget.config' | echo
19-
20-
40+
Get-Content '${{github.workspace}}/NuGet.Config' | echo
41+
- name: Read environment variables as is
42+
shell: pwsh
43+
run: "Get-Item -Path Env:"
44+
- name: Read github set environment variable
45+
shell: pwsh
46+
run: "Get-Item -Path Env:"
47+
env:
48+
"ConnectionStrings:ApiserviceDb": "$env:PWSH_Environ"
49+
"OuterCurly": "${{ env.PWSH_Environ }}"
50+
"OuterCurly2": "${{ env.action_state }}"
51+
- name: as in doc
52+
run: echo "Deploying to production server on branch $GITHUB_REF"
53+
- name: as on hn
54+
run: echo "Deploying to production server on branch $env:GITHUB_REF"
55+
- name: as in other places
56+
run: echo "Deploying to production server on branch ${{ env.GITHUB_REF }}"

‎api.core.nuget.sln

+144
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32407.343
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "apiservice.core.nuget", "src\apiservice.core\apiservice.core.nuget.csproj", "{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1} = {22F73F53-129F-4112-BC7B-2C5C58AFC9B1}
9+
EndProjectSection
10+
EndProject
11+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "apicaller.core.nuget", "src\apicaller.core\apicaller.core.nuget.csproj", "{46EC0C05-9862-46A9-A8D2-9988F5245782}"
12+
EndProject
13+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "apitest.core.nuget", "src\apitest.core\apitest.core.nuget.csproj", "{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}"
14+
EndProject
15+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "accesscode_sm.core", "src\apiservice.core\Controllers\accesscode_sm.core.vcxproj", "{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}"
16+
EndProject
17+
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "apiservice.db", "src\apiservice.db\apiservice.db.sqlproj", "{A697994D-0365-466A-B9BA-4A8A5F0596D8}"
18+
EndProject
19+
Global
20+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
21+
Debug|Any CPU = Debug|Any CPU
22+
Debug|ARM = Debug|ARM
23+
Debug|ARM64 = Debug|ARM64
24+
Debug|x64 = Debug|x64
25+
Debug|x86 = Debug|x86
26+
Release|Any CPU = Release|Any CPU
27+
Release|ARM = Release|ARM
28+
Release|ARM64 = Release|ARM64
29+
Release|x64 = Release|x64
30+
Release|x86 = Release|x86
31+
EndGlobalSection
32+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
33+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|ARM.ActiveCfg = Debug|Any CPU
36+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|ARM.Build.0 = Debug|Any CPU
37+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|ARM64.ActiveCfg = Debug|Any CPU
38+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|ARM64.Build.0 = Debug|Any CPU
39+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|x64.ActiveCfg = Debug|Any CPU
40+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|x64.Build.0 = Debug|Any CPU
41+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|x86.ActiveCfg = Debug|Any CPU
42+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Debug|x86.Build.0 = Debug|Any CPU
43+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|ARM.ActiveCfg = Release|Any CPU
46+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|ARM.Build.0 = Release|Any CPU
47+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|ARM64.ActiveCfg = Release|Any CPU
48+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|ARM64.Build.0 = Release|Any CPU
49+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|x64.ActiveCfg = Release|Any CPU
50+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|x64.Build.0 = Release|Any CPU
51+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|x86.ActiveCfg = Release|Any CPU
52+
{13497EE9-EACF-4F88-9EB0-03DE6BFBA3EE}.Release|x86.Build.0 = Release|Any CPU
53+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|ARM.ActiveCfg = Debug|Any CPU
56+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|ARM.Build.0 = Debug|Any CPU
57+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|ARM64.ActiveCfg = Debug|Any CPU
58+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|ARM64.Build.0 = Debug|Any CPU
59+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|x64.ActiveCfg = Debug|Any CPU
60+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|x64.Build.0 = Debug|Any CPU
61+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|x86.ActiveCfg = Debug|Any CPU
62+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Debug|x86.Build.0 = Debug|Any CPU
63+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|Any CPU.ActiveCfg = Release|Any CPU
64+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|Any CPU.Build.0 = Release|Any CPU
65+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|ARM.ActiveCfg = Release|Any CPU
66+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|ARM.Build.0 = Release|Any CPU
67+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|ARM64.ActiveCfg = Release|Any CPU
68+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|ARM64.Build.0 = Release|Any CPU
69+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|x64.ActiveCfg = Release|Any CPU
70+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|x64.Build.0 = Release|Any CPU
71+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|x86.ActiveCfg = Release|Any CPU
72+
{46EC0C05-9862-46A9-A8D2-9988F5245782}.Release|x86.Build.0 = Release|Any CPU
73+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
75+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|ARM.ActiveCfg = Debug|Any CPU
76+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|ARM.Build.0 = Debug|Any CPU
77+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|ARM64.ActiveCfg = Debug|Any CPU
78+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|ARM64.Build.0 = Debug|Any CPU
79+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|x64.ActiveCfg = Debug|Any CPU
80+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|x64.Build.0 = Debug|Any CPU
81+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|x86.ActiveCfg = Debug|Any CPU
82+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Debug|x86.Build.0 = Debug|Any CPU
83+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
84+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|Any CPU.Build.0 = Release|Any CPU
85+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|ARM.ActiveCfg = Release|Any CPU
86+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|ARM.Build.0 = Release|Any CPU
87+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|ARM64.ActiveCfg = Release|Any CPU
88+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|ARM64.Build.0 = Release|Any CPU
89+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|x64.ActiveCfg = Release|Any CPU
90+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|x64.Build.0 = Release|Any CPU
91+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|x86.ActiveCfg = Release|Any CPU
92+
{58ECDDA4-4F3D-4C86-9DEF-E00E61FFDF2B}.Release|x86.Build.0 = Release|Any CPU
93+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Debug|Any CPU.ActiveCfg = Debug|Win32
94+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Debug|Any CPU.Build.0 = Debug|Win32
95+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Debug|ARM.ActiveCfg = Debug|Win32
96+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Debug|ARM64.ActiveCfg = Debug|Win32
97+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Debug|x64.ActiveCfg = Debug|x64
98+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Debug|x64.Build.0 = Debug|x64
99+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Debug|x86.ActiveCfg = Debug|Win32
100+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Debug|x86.Build.0 = Debug|Win32
101+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Release|Any CPU.ActiveCfg = Release|Win32
102+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Release|ARM.ActiveCfg = Release|Win32
103+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Release|ARM64.ActiveCfg = Release|Win32
104+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Release|x64.ActiveCfg = Release|x64
105+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Release|x64.Build.0 = Release|x64
106+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Release|x86.ActiveCfg = Release|Win32
107+
{22F73F53-129F-4112-BC7B-2C5C58AFC9B1}.Release|x86.Build.0 = Release|Win32
108+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
109+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
110+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
111+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|ARM.ActiveCfg = Debug|Any CPU
112+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|ARM.Build.0 = Debug|Any CPU
113+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|ARM.Deploy.0 = Debug|Any CPU
114+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|ARM64.ActiveCfg = Debug|Any CPU
115+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|ARM64.Build.0 = Debug|Any CPU
116+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|ARM64.Deploy.0 = Debug|Any CPU
117+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|x64.ActiveCfg = Debug|Any CPU
118+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|x64.Build.0 = Debug|Any CPU
119+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|x64.Deploy.0 = Debug|Any CPU
120+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|x86.ActiveCfg = Debug|Any CPU
121+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|x86.Build.0 = Debug|Any CPU
122+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Debug|x86.Deploy.0 = Debug|Any CPU
123+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
124+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|Any CPU.Deploy.0 = Release|Any CPU
125+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|ARM.ActiveCfg = Release|Any CPU
126+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|ARM.Build.0 = Release|Any CPU
127+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|ARM.Deploy.0 = Release|Any CPU
128+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|ARM64.ActiveCfg = Release|Any CPU
129+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|ARM64.Build.0 = Release|Any CPU
130+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|ARM64.Deploy.0 = Release|Any CPU
131+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|x64.ActiveCfg = Release|Any CPU
132+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|x64.Build.0 = Release|Any CPU
133+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|x64.Deploy.0 = Release|Any CPU
134+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|x86.ActiveCfg = Release|Any CPU
135+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|x86.Build.0 = Release|Any CPU
136+
{A697994D-0365-466A-B9BA-4A8A5F0596D8}.Release|x86.Deploy.0 = Release|Any CPU
137+
EndGlobalSection
138+
GlobalSection(SolutionProperties) = preSolution
139+
HideSolutionNode = FALSE
140+
EndGlobalSection
141+
GlobalSection(ExtensibilityGlobals) = postSolution
142+
SolutionGuid = {5C413A58-74DC-4D2A-8864-8CD637E879D7}
143+
EndGlobalSection
144+
EndGlobal

‎src/apicaller.core/Properties/AssemblyInfo.cs

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
using System.Runtime.CompilerServices;
2+
3+
[assembly: InternalsVisibleTo("apitest.core")]
4+
[assembly: InternalsVisibleTo("apitest.core.nuget")]

‎src/apicaller.core/apicaller.core.nuget.csproj

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<RootNamespace>apicaller</RootNamespace>
7+
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="asplib.core" Version="0.2.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.10">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
18+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<ProjectReference Include="..\apiservice.core\apiservice.core.nuget.csproj" />
23+
</ItemGroup>
24+
25+
<ProjectExtensions><VisualStudio><UserProperties properties_4launchsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
26+
27+
</Project>

‎src/apiservice.core/Properties/AssemblyInfo.cs

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
using System.Runtime.CompilerServices;
2+
3+
[assembly: InternalsVisibleTo("apitest.core")]
4+
[assembly: InternalsVisibleTo("apitest.core.nuget")]

‎src/apiservice.core/apiservice.core.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
<ProjectReference Include="..\asplib.core\asplib.core.csproj" />
2828
<ProjectReference Include="..\asplib\asplib.csproj" />
2929
<ProjectReference Include="..\smc\smc.csproj" />
30+
</ItemGroup>
31+
32+
<!-- Don't require the SMC code generator Makefile project dependency when /p:noSmc=true -->
33+
<ItemGroup Condition="$(noSmc)!='true'">
3034
<ProjectReference Include="Controllers\accesscode_sm.core.vcxproj">
3135
<Name>accesscode_sm.core</Name>
3236
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎src/apiservice.core/apiservice.core.nuget.csproj

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<RootNamespace>apiservice</RootNamespace>
7+
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="asplib.core" Version="0.2.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.10" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.10">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.10">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
22+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
23+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.10" />
24+
<PackageReference Include="System.Data.SqlClient" Version="4.8.4" />
25+
</ItemGroup>
26+
27+
<!-- Don't require the SMC code generator Makefile project dependency when /p:noSmc=true -->
28+
<ItemGroup Condition="$(noSmc)!='true'">
29+
<ProjectReference Include="Controllers\accesscode_sm.core.vcxproj">
30+
<Name>accesscode_sm.core</Name>
31+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
32+
</ProjectReference>
33+
</ItemGroup>
34+
35+
</Project>

‎src/apitest.core/apicaller/ServiceProvider.cs

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ private static void CreateMembers()
6161
.AddJsonFile(
6262
Path.Combine("apicaller", "appsettings.json"),
6363
optional: false, reloadOnChange: true)
64+
.AddEnvironmentVariables()
6465
.Build();
6566
var startup = new Startup(_configuration);
6667
var sc = new ServiceCollection();

‎src/apitest.core/apiservice/ServiceProvider.cs

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ private static void CreateMembers()
6161
.AddJsonFile(
6262
Path.Combine("apiservice", "appsettings.json"),
6363
optional: false, reloadOnChange: true)
64+
.AddEnvironmentVariables()
6465
.Build();
6566
var startup = new Startup(_configuration);
6667
var sc = new ServiceCollection();

‎src/apitest.core/apitest.core.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11+
<PackageReference Include="asplib.core" Version="0.2.0" />
1112
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.10" />
1213
<PackageReference Include="nunit" Version="3.13.3" />
1314
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1">

0 commit comments

Comments
 (0)