Skip to content

Commit

Permalink
Revert "Update .editorconfig"
Browse files Browse the repository at this point in the history
This reverts commit e08039e.
  • Loading branch information
jmcouffin committed Dec 3, 2024
1 parent 9177c06 commit ff65453
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,16 @@ jobs:
os: [windows-latest]

steps:
<<<<<<< HEAD
- uses: actions/checkout@v4
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v3
=======
- uses: actions/checkout@v2
- name: Setup .NET 6.0
uses: actions/setup-dotnet@v1
>>>>>>> parent of dcb1f34 (Update main.yml)
with:
dotnet-version: '6.0.x'
- name: Build
run: pwsh make.ps1
- name: Package
run: pwsh make.ps1 package
<<<<<<< HEAD
- uses: actions/upload-artifact@v4
=======
- uses: actions/upload-artifact@v2
>>>>>>> parent of dcb1f34 (Update main.yml)
with:
name: packages
path: Package/Release/Packages
Expand Down
2 changes: 1 addition & 1 deletion Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</ItemGroup>
<Copy DestinationFolder="$(StageDir)" SourceFiles="@(InfoFiles)" />
<ItemGroup>
<AssemblyFiles Include="$(BinDir)\$(Configuration)\**\*.dll;$(BinDir)\$(Configuration)\**\*.pdb" Exclude="$(BinDir)\$(Configuration)\**\Microsoft.*.Test.*" />
<AssemblyFiles Include="$(BinDir)\$(Configuration)\**\Microsoft.Scripting.*;$(BinDir)\$(Configuration)\**\pyRevitLabs.Microsoft.Dynamic.*" Exclude="$(BinDir)\$(Configuration)\**\Microsoft.*.Test.*" />
</ItemGroup>
<Copy DestinationFolder="$(StageDir)\%(RecursiveDir)" SourceFiles="@(AssemblyFiles)" />
</Target>
Expand Down

0 comments on commit ff65453

Please sign in to comment.