Skip to content

Commit 78fbcda

Browse files
authored
Merge branch 'Azure:main' into master
2 parents 77c6675 + 8480d0a commit 78fbcda

735 files changed

Lines changed: 88497 additions & 15837 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/codeQL.yml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# This workflow generates weekly CodeQL reports for this repo, a security requirements.
2+
# The workflow is adapted from the following reference: https://github.com/Azure-Samples/azure-functions-python-stream-openai/pull/2/files
3+
# Generic comments on how to modify these file are left intactfor future maintenance.
4+
5+
name: "CodeQL"
6+
7+
on:
8+
push:
9+
branches: [ "main", "dajusto/code-ql", "*" ] # TODO: remove development branch after approval
10+
pull_request:
11+
branches: [ "main", "dajusto/code-ql", "*"] # TODO: remove development branch after approval
12+
schedule:
13+
- cron: '0 0 * * 1' # Weekly Monday run, needed for weekly reports
14+
workflow_call: # allows to be invoked as part of a larger workflow
15+
workflow_dispatch: # allows for the workflow to run manually see: https://docs.github.com/en/actions/using-workflows/manually-running-a-workflow
16+
17+
env:
18+
solution: DurableTask.sln
19+
config: Release
20+
21+
jobs:
22+
23+
analyze:
24+
name: Analyze
25+
runs-on: windows-latest
26+
permissions:
27+
actions: read
28+
contents: read
29+
security-events: write
30+
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: ['csharp']
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
37+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
38+
39+
steps:
40+
# Initializes the CodeQL tools for scanning.
41+
- name: Initialize CodeQL
42+
uses: github/codeql-action/init@v3
43+
with:
44+
languages: ${{ matrix.language }}
45+
# If you wish to specify custom queries, you can do so here or in a config file.
46+
# By default, queries listed here will override any specified in a config file.
47+
# Prefix the list here with "+" to use these queries and those in the config file.
48+
49+
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
50+
# queries: security-extended,security-and-quality
51+
52+
- uses: actions/checkout@v3
53+
with:
54+
submodules: true
55+
56+
- name: Setup .NET
57+
uses: actions/setup-dotnet@v3
58+
59+
- name: Set up .NET Core 2.1
60+
uses: actions/setup-dotnet@v3
61+
with:
62+
dotnet-version: '2.1.x'
63+
64+
- name: Set up .NET Core 3.1
65+
uses: actions/setup-dotnet@v3
66+
with:
67+
dotnet-version: '3.1.x'
68+
69+
- name: Restore dependencies
70+
run: dotnet restore $solution
71+
72+
- name: Build
73+
run: dotnet build $solution #--configuration $config #--no-restore -p:FileVersionRevision=$GITHUB_RUN_NUMBER -p:ContinuousIntegrationBuild=true
74+
75+
# Run CodeQL analysis
76+
- name: Perform CodeQL Analysis
77+
uses: github/codeql-action/analyze@v3
78+
with:
79+
category: "/language:${{matrix.language}}"

.gitignore

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
*.user
1111
bin/
1212
obj/
13+
pkg/
1314
packages/
1415
TestResults/
15-
sign.snk
16+
Debug/
1617

1718
# Packages #
1819
############
@@ -29,6 +30,7 @@ sign.snk
2930

3031
# Logs and databases #
3132
######################
33+
.vs/
3234
*.log
3335
*.sql
3436
*.sqlite
@@ -42,4 +44,9 @@ sign.snk
4244
.Trashes
4345
Icon?
4446
ehthumbs.db
45-
Thumbs.db
47+
Thumbs.db
48+
.vs/
49+
50+
# Publish Web output #
51+
######################
52+
PublishProfiles/

.nuget/NuGet.targets

Lines changed: 0 additions & 133 deletions
This file was deleted.

Directory.Build.targets

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project>
2+
<!-- This is copied from:https://github.com/Azure/azure-functions-host/blob/dev/eng/build/RepositoryInfo.targets -->
3+
<!-- The following build target allows us to reconstruct source-link information when building in 1ES -->
4+
5+
<!--
6+
The convention for names of Azure DevOps repositories mirrored from GitHub is "{GitHub org name}.{GitHub repository name}".
7+
-->
8+
<PropertyGroup>
9+
<!-- There are quite a few git repo forms:
10+
https://azfunc@dev.azure.com/azfunc/internal/_git/azure.azure-functions-host
11+
https://dev.azure.com/azfunc/internal/_git/azure.azure-functions-host
12+
https://azfunc.visualstudio.com/internal/_git/azure.azure-functions-host
13+
azfunc@vs-ssh.visualstudio.com:v3/azfunc/internal/azure.azure-functions-host
14+
git@ssh.dev.azure.com:v3/azfunc/internal/azure.azure-functions-host
15+
-->
16+
<!-- Set DisableSourceLinkUrlTranslation to true when building a tool for internal use where sources only come from internal URIs -->
17+
<DisableSourceLinkUrlTranslation Condition="'$(DisableSourceLinkUrlTranslation)' == ''">false</DisableSourceLinkUrlTranslation>
18+
<_TranslateUrlPattern>(https://azfunc%40dev\.azure\.com/azfunc/internal/_git|https://dev\.azure\.com/azfunc/internal/_git|https://azfunc\.visualstudio\.com/internal/_git|azfunc%40vs-ssh\.visualstudio\.com:v3/azfunc/internal|git%40ssh\.dev\.azure\.com:v3/azfunc/internal)/([^/\.]+)\.(.+)</_TranslateUrlPattern>
19+
<_TranslateUrlReplacement>https://github.com/$2/$3</_TranslateUrlReplacement>
20+
</PropertyGroup>
21+
22+
<!-- When building from Azure Devops we update SourceLink to point back to the GitHub repo. -->
23+
<Target Name="_TranslateAzureDevOpsUrlToGitHubUrl"
24+
Condition="'$(DisableSourceLinkUrlTranslation)' == 'false'"
25+
DependsOnTargets="$(SourceControlManagerUrlTranslationTargets)"
26+
BeforeTargets="SourceControlManagerPublishTranslatedUrls">
27+
<PropertyGroup>
28+
<ScmRepositoryUrl>$([System.Text.RegularExpressions.Regex]::Replace($(ScmRepositoryUrl), $(_TranslateUrlPattern), $(_TranslateUrlReplacement)))</ScmRepositoryUrl>
29+
</PropertyGroup>
30+
<ItemGroup>
31+
<SourceRoot Update="@(SourceRoot)">
32+
<ScmRepositoryUrl>$([System.Text.RegularExpressions.Regex]::Replace(%(SourceRoot.ScmRepositoryUrl), $(_TranslateUrlPattern), $(_TranslateUrlReplacement)))</ScmRepositoryUrl>
33+
</SourceRoot>
34+
</ItemGroup>
35+
</Target>
36+
37+
</Project>

0 commit comments

Comments
 (0)