Skip to content
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.

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

pull upstream #1

Merged
merged 49 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
f595de0
Print exceptions on policy decrypt errors
Mayyhem Aug 28, 2023
371bd88
Merge pull request #41 from Mayyhem/handle-policy-decrypt-errors
Mayyhem Sep 16, 2023
3ca6b99
Updated variable, option, and class names and descriptions to reflect…
Mayyhem Oct 26, 2023
955817a
dnMerge working. Added wait timer option to exec.
Mayyhem Oct 26, 2023
b3054a6
Incrementing version and adding release details
Mayyhem Oct 26, 2023
f1fd83c
Fixed misspelling
Mayyhem Oct 26, 2023
14d6be0
Merge pull request #43 from Mayyhem/exec-timers
Mayyhem Oct 26, 2023
5d4bdcd
Change management point to SMS Provider
Mayyhem Oct 26, 2023
bd42a0f
Fixed default wait time for exec
Mayyhem Nov 7, 2023
f873b56
Updated version info and release notes
Mayyhem Nov 7, 2023
836b67a
Merge pull request #44 from Mayyhem/2.0.3
Mayyhem Nov 7, 2023
b4d6578
Fixed exec --wait-time default
Mayyhem Nov 7, 2023
a6ab34f
Updated default wait period for application deployments to 5 minutes
Mayyhem Nov 7, 2023
06ac366
Merge pull request #45 from Mayyhem/bugfix-exec-waittime
Mayyhem Nov 7, 2023
b424f82
Tentative fix for issue #39. Needs additional testing with provided c…
Mayyhem Nov 10, 2023
57264e3
Added Arsenal '23 badge to readme
subat0mik Jan 22, 2024
c61d810
Update SharpSCCM.csproj
Mayyhem Jan 25, 2024
ff4fdd4
Merge pull request #47 from Mayyhem/subat0mik-readme-badge-update
Mayyhem Jan 29, 2024
f34d2e5
Updated version and release notes
Mayyhem Jan 29, 2024
0489cd4
Merge pull request #48 from Mayyhem/2.0.4
Mayyhem Jan 29, 2024
72cfde4
Updated JSON parsing logic for CMPivot
Mayyhem Jan 29, 2024
12becaa
Updated invoke admin-service output format
Mayyhem Jan 31, 2024
3b92fca
Updated 2.0.5 release date
Mayyhem Jan 31, 2024
f936693
Merge pull request #49 from Mayyhem/issue-40
Mayyhem Jan 31, 2024
9161812
Fixed issue #35
Mayyhem Jan 31, 2024
842bcc0
Updated version and release notes
Mayyhem Jan 31, 2024
ee5f907
Merge pull request #50 from Mayyhem/issue-35
Mayyhem Jan 31, 2024
4ff8856
Display HTTP status code on error to address issue #36
Mayyhem Jan 31, 2024
bf115b3
Merge pull request #51 from Mayyhem/issue-36
Mayyhem Jan 31, 2024
781ed2c
Retiring DeobfuscateSecretString, which was ported into SharpSCCM
Mayyhem Jan 31, 2024
fa017fd
Merge pull request #52 from Mayyhem/retire-deobfstring
Mayyhem Jan 31, 2024
be623a5
Update codeql.yml
Mayyhem Jan 31, 2024
4c82ce2
Update codeql.yml
Mayyhem Jan 31, 2024
fdb3c05
Only execute code scan on PR
Mayyhem Jan 31, 2024
dfa9d7a
Create release.yml
Mayyhem Jan 31, 2024
3f84511
Update release.yml
Mayyhem Feb 1, 2024
bf2d869
Update release.yml
Mayyhem Feb 1, 2024
8297c70
Update release.yml
Mayyhem Feb 1, 2024
084535f
Update release.yml
Mayyhem Feb 1, 2024
526716e
Update release.yml
Mayyhem Feb 1, 2024
e8f4eb8
Update release.yml
Mayyhem Feb 1, 2024
f26a773
Update release.yml
Mayyhem Feb 1, 2024
4c88aa3
Update release.yml
Mayyhem Feb 1, 2024
bdc6bc9
Update release.yml
Mayyhem Feb 1, 2024
f43eb08
Update release.yml
Mayyhem Feb 1, 2024
c61ef5f
Bypass FIPS compliance enforcement
subat0mik Feb 22, 2024
0828885
Merge pull request #53 from subat0mik/main
Mayyhem Mar 19, 2024
2430f93
Update RELEASE_NOTES.md
Mayyhem Mar 19, 2024
7d67cfd
Update AssemblyInfo.cs
Mayyhem Mar 19, 2024
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
14 changes: 5 additions & 9 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,14 @@
name: "CodeQL"

on:
push:
branches: [ "main" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
schedule:
- cron: '21 9 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: windows-latest
permissions:
actions: read
contents: read
Expand All @@ -32,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'cpp', 'csharp' ]
language: [ 'csharp' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Use only 'java' to analyze code written in Java, Kotlin or both
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
Expand All @@ -44,7 +40,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -58,7 +54,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -71,6 +67,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
51 changes: 51 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: .NET Framework Release

on:
workflow_dispatch:
push:
tags:
- "v*.*.*"

jobs:

build:

runs-on: windows-latest

env:
Configuration: Release
Solution: SharpSCCM.sln

steps:

# Checkout repository
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

# Setup packages
- name: Setup NuGet
uses: NuGet/setup-nuget@v2
- run: nuget restore $env:Solution

# Build
- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v2
- name: Build solution
run: msbuild $env:Solution -t:rebuild -property:Configuration=$env:Configuration

# Release
- name: Update release
uses: softprops/action-gh-release@v1
with:
name: ${{ github.ref_name }}
tag_name: ${{ github.ref_name }}
prerelease: false
body: |
This is the release of ${{ env.Solution }} compiled from source (${{ github.sha }}).
The repository updates releases automatically to keep them up-to-date with the latest tagged version.
fail_on_unmatched_files: true
files: |
D:/a/SharpSCCM/SharpSCCM/bin/Release/SharpSCCM.exe
RELEASE_NOTES.md
5 changes: 5 additions & 0 deletions App.config
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
<enforceFIPSPolicy enabled="false"/>
</runtime>
</configuration>
107 changes: 0 additions & 107 deletions DeobfuscateSecretString/DeobfuscateSecretString.cpp

This file was deleted.

152 changes: 0 additions & 152 deletions DeobfuscateSecretString/DeobfuscateSecretString.vcxproj

This file was deleted.

Loading