Skip to content

Bump eventsource from 1.1.0 to 1.1.1 in /2wr-app #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dependabot wants to merge 25 commits into from
Closed

Bump eventsource from 1.1.0 to 1.1.1 in /2wr-app #158

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5302a25
Include DevContainer for Development Environment (#126)
davidwesst Jan 24, 2022
dcb56f0
Updated wireframes url
codingbandit Mar 3, 2022
9764f10
Added slack invitation link
codingbandit Mar 5, 2022
bc63e22
Updated to Richard Campbell for slack contact
codingbandit Mar 5, 2022
10f76fa
Updated to .NET6 and consolidated Program.cs (#138)
csharpfritz Mar 5, 2022
c2663e3
Update function app to .NET 6 (#139)
Mar 5, 2022
992833c
Run e2e tests in PRs (#140)
Mar 5, 2022
1d6e38f
Implemented Hazard Hunt data entry, added calls to the API, and fixed…
codingbandit Mar 5, 2022
56e194d
Adding Hazard Hunt information into the UI
codingbandit Mar 5, 2022
1c53c15
Adding Hazard Hunt information into the UI (#144)
codingbandit Mar 5, 2022
027a979
Added a placeholder for the "Make A Plan" screen. This screen has a b…
codingbandit Mar 5, 2022
d6aadf1
Merge branch 'main' into feature/2wr-app-Hazard-Hunt-UI
codingbandit Mar 5, 2022
35f163d
updated devcontainer to use .NET 6 and Func v4
davidwesst Mar 5, 2022
6ab15ea
Merge pull request #146 from cocobokostudios/ft/devcontainer-updates
davidwesst Mar 5, 2022
f698d24
Merge pull request #145 from HTBox/feature/2wr-app-Hazard-Hunt-UI
shawnwildermuth Mar 5, 2022
c2da0e7
Added get basekit-by-id (#149)
Rollerss Mar 5, 2022
acdc29c
Bump async from 2.6.3 to 2.6.4 in /2wr-app
dependabot[bot] Apr 29, 2022
cb670eb
Merge pull request #154 from HTBox/dependabot/npm_and_yarn/2wr-app/as…
shawnwildermuth Apr 30, 2022
3473aab
DevContainer/Codespaces Documentation (#155)
davidwesst May 2, 2022
c90ae6e
Update repository methods (#152)
Rollerss May 11, 2022
13bd293
Added architecture diagram
May 12, 2022
d07f774
Support running github actions locally
dpaquette May 12, 2022
2080c0f
Merge branch 'main' of https://github.com/HTBox/TwoWeeksReady
dpaquette May 12, 2022
6206c62
Build Emergency Kits Feature (#157)
May 14, 2022
67912ad
Bump eventsource from 1.1.0 to 1.1.1 in /2wr-app
dependabot[bot] Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update function app to .NET 6 (#139) 
* Update function app to .NET 6

* Update github workflows for branch name and .net version

Co-authored-by: David Paquette <dave.paquette@outlook.com>
  • Loading branch information
@dpaquette
David Paquette and dpaquette authored Mar 5, 2022
commit c2663e3dfbb9bc966492059f5bf16b51fa101dcd
14 changes: 5 additions & 9 deletions .github/workflows/admin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ on:
- '2wr-app/public/images/**'
- 'TwoWeeksReady.Common/**'
- '.github/workflows/admin.yaml'
branches: [ master ]
branches: [ main ]
pull_request:
paths:
- 'admin/**'
- '2wr-app/public/images/**'
- '.github/workflows/admin.yaml'
branches: [ master ]
branches: [ main ]
workflow_dispatch:
jobs:
build:
Expand All @@ -23,11 +23,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x
- name: Setup .NET 5
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Build
run: dotnet build -c Release
working-directory: ./admin
Expand All @@ -36,12 +32,12 @@ jobs:
working-directory: ./admin
- name: Zip Functions Package
run: zip -r ../deploy.zip ./
working-directory: ./admin/TwoWeeksReady.Admin/bin/Release/net5.0/publish/
working-directory: ./admin/TwoWeeksReady.Admin/bin/Release/net6.0/publish/
- name: Upload Deployment Zip
uses: actions/upload-artifact@v2
with:
name: deployment_zip
path: ./admin/TwoWeeksReady.Admin/bin/Release/net5.0/deploy.zip
path: ./admin/TwoWeeksReady.Admin/bin/Release/net6.0/deploy.zip
- name: Upload Deployment Script
uses: actions/upload-artifact@v2
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:
- 'api/**'
- 'TwoWeeksReady.Common/**'
- '.github/workflows/api.yaml'
branches: [ master ]
branches: [ main ]
pull_request:
paths:
- 'api/**'
- '.github/workflows/api.yaml'
branches: [ master ]
branches: [ main ]
workflow_dispatch:
jobs:
build:
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.x
dotnet-version: 6.0.x
- name: Build
run: dotnet build -c Release
working-directory: ./api
Expand All @@ -30,12 +30,12 @@ jobs:
working-directory: ./api
- name: Zip Functions Package
run: zip -r ../deploy.zip ./
working-directory: ./api/TwoWeeksReady/bin/Release/netcoreapp3.1/publish/
working-directory: ./api/TwoWeeksReady/bin/Release/net6.0/publish/
- name: Upload Deployment Zip
uses: actions/upload-artifact@v2
with:
name: deployment_zip
path: ./api/TwoWeeksReady/bin/Release/netcoreapp3.1/deploy.zip
path: ./api/TwoWeeksReady/bin/Release/net6.0/deploy.zip
- name: Upload Deployment Script
uses: actions/upload-artifact@v2
with:
Expand Down
13 changes: 7 additions & 6 deletions api/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

## Prerequisites

[.NET Core SDK 3.1](https://dotnet.microsoft.com/download)
[.NET SDK 6.0](https://dotnet.microsoft.com/download)

[Azure Functions Core Tools 3](https://docs.microsoft.com/en-us/azure/azure-functions/functions-run-local?tabs=windows%2Ccsharp%2Cbash#install-the-azure-functions-core-tools)
[Azure Functions Core Tools 4](https://docs.microsoft.com/en-us/azure/azure-functions/functions-run-local?tabs=windows%2Ccsharp%2Cbash#install-the-azure-functions-core-tools)

`npm i -g azure-functions-core-tools@3 --unsafe-perm true`
`npm i -g azure-functions-core-tools@4 --unsafe-perm true`

### Using VS Code

Expand All @@ -24,11 +24,11 @@ Alternatively, there is an Azurite VS Code Extension:

[Install Azure Extension](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azurite#install-and-run-the-azurite-visual-studio-code-extension)

### Using Visual Studio 2019
### Using Visual Studio 2022

Open the `api.sln` in Visual Studio 2019.
Open the `api.sln` in Visual Studio 2022.

You will also need the Azure Storage Emulator if using Visual Studio 2019 (if you're using VS Code, look above).
You will also need the Azure Storage Emulator if using Visual Studio 2022 (if you're using VS Code, look above).

[Install Azure Storage Emulator](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator?toc=/azure/storage/blobs/toc.json#get-the-storage-emulator)

Expand Down Expand Up @@ -64,6 +64,7 @@ Create a `local.settings.json` file in the TwoWeeksReady project folder. You wil
{
"IsEncrypted": false,
"Values": {
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
"FUNCTIONS_WORKER_RUNTIME": "dotnet",
"OidcApiAuthSettings:Audience": "https://2wrdev.azurewebsites.net",
"OidcApiAuthSettings:IssuerUrl": "https://login.2wr.org/"
Expand Down
12 changes: 6 additions & 6 deletions api/TwoWeeksReady/TwoWeeksReady.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
<TargetFramework>net6.0</TargetFramework>
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
<_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.8.3" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.10" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.CosmosDB" Version="3.0.7" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.9" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.10.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="5.0.0" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.CosmosDB" Version="3.0.10" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.0" />
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="AzureFunctions.OidcAuthentication" Version="1.0.4" />
Expand Down