Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/nuget/src/YamlDotNet-15.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
begonaguereca committed Apr 25, 2024
2 parents 9f0cb36 + ce1bd7b commit c90a648
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @github/actions-importer-reviewers
* @github/migration-tools-reviewers
30 changes: 8 additions & 22 deletions .licenses/licenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ License notice for JUnitTestLogger (v1.1.0)
https://github.com/syncromatics/JUnitTestLogger


License notice for Microsoft.NET.Test.Sdk (v17.8.0)
License notice for Microsoft.NET.Test.Sdk (v17.9.0)
------------------------------------

https://github.com/microsoft/vstest at cf7d549fc0197abaabec19d61d2c20d7a7b089f8
https://github.com/microsoft/vstest at a77b8d5b4aa89504bbff10e2880c27fd55adc55b

Copyright © Microsoft Corporation. All rights reserved.

Expand Down Expand Up @@ -118,10 +118,10 @@ Licensed under Apache-2.0
Available at https://licenses.nuget.org/Apache-2.0


License notice for Microsoft.CodeCoverage (v17.8.0)
License notice for Microsoft.CodeCoverage (v17.9.0)
------------------------------------

https://github.com/microsoft/vstest at cf7d549fc0197abaabec19d61d2c20d7a7b089f8
https://github.com/microsoft/vstest at a77b8d5b4aa89504bbff10e2880c27fd55adc55b

Copyright © Microsoft Corporation. All rights reserved.

Expand All @@ -140,10 +140,10 @@ Copyright © Microsoft Corporation. All rights reserved.
License available at http://go.microsoft.com/fwlink/?LinkId=329770


License notice for Microsoft.TestPlatform.ObjectModel (v17.8.0)
License notice for Microsoft.TestPlatform.ObjectModel (v17.9.0)
------------------------------------

https://github.com/microsoft/vstest at cf7d549fc0197abaabec19d61d2c20d7a7b089f8
https://github.com/microsoft/vstest at a77b8d5b4aa89504bbff10e2880c27fd55adc55b

Copyright © Microsoft Corporation. All rights reserved.

Expand All @@ -152,10 +152,10 @@ Available at https://aka.ms/deprecateLicenseUrl
LICENSE_MIT.txt


License notice for Microsoft.TestPlatform.TestHost (v17.8.0)
License notice for Microsoft.TestPlatform.TestHost (v17.9.0)
------------------------------------

https://github.com/microsoft/vstest at cf7d549fc0197abaabec19d61d2c20d7a7b089f8
https://github.com/microsoft/vstest at a77b8d5b4aa89504bbff10e2880c27fd55adc55b

Copyright © Microsoft Corporation. All rights reserved.

Expand Down Expand Up @@ -188,20 +188,6 @@ Licensed under MIT
Available at https://licenses.nuget.org/MIT


License notice for NuGet.Frameworks (v6.5.0)
------------------------------------

https://github.com/NuGet/NuGet.Client at 069970c727b254636c1ad29c5a7a767081482a9a

https://aka.ms/nugetprj

Copyright © Microsoft Corporation. All rights reserved.

Licensed under Apache-2.0

Available at https://licenses.nuget.org/Apache-2.0


License notice for System.Diagnostics.EventLog (v6.0.0)
------------------------------------

Expand Down
24 changes: 0 additions & 24 deletions ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -304,30 +304,6 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


---------------------------------------------------------

---------------------------------------------------------

NuGet.Frameworks 6.5.0 - Apache-2.0
https://github.com/NuGet/NuGet.Client

Copyright (c) .NET Foundation and Contributors.

All rights reserved.


Licensed under the Apache License, Version 2.0 (the "License"); you may not use
these files except in compliance with the License. You may obtain a copy of the
License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.


---------------------------------------------------------

---------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/bamboo/plugins/AWSCodeDeploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Deploy:
credentialsId: '10092545'
region: US_WEST_1
applicationName: AppECS-begona_cluster-alt_service
s3Bucket: elasticbeanstalk-us-west-1-778232459879
s3Bucket: FA
```

## Transformed Github Action
Expand All @@ -26,7 +26,7 @@ Deploy:
aws-secret-access-key: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
- run: |-
commit_hash=$(git rev-parse --short ${{ env.GITHUB_SHA }})
aws deploy create-deployment --application-name AppECS-begona_cluster-alt_service --deployment-group-name DgpECS-begona_cluster-alt_service --s3-location bucket=elasticbeanstalk-us-west-1-778232459879,key=${{ secrets.AWS_S3_BUCKET_KEY }},bundleType={{ env.BUNDLE_TYPE }} --github-location repository=$GITHUB_REPOSITORY,commitId=$commit_hash --ignore-application-stop-failures
aws deploy create-deployment --application-name AppECS-begona_cluster-alt_service --deployment-group-name DgpECS-begona_cluster-alt_service --s3-location bucket=FA,key=${{ secrets.AWS_S3_BUCKET_KEY }},bundleType={{ env.BUNDLE_TYPE }} --github-location repository=$GITHUB_REPOSITORY,commitId=$commit_hash --ignore-application-stop-failures
```

## Unsupported Options
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

<ItemGroup>
<PackageReference Include="JUnitTestLogger" Version="1.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Moq" Version="4.20.69" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit c90a648

Please sign in to comment.