diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3eb3e42e..dedfa51e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -30,13 +30,17 @@ jobs: with: fetch-depth: 0 # And any submodules - - name: Checkout submodules - shell: bash - run: | - git config --global url."https://github.com/".insteadOf "git@github.com:" - auth_header="$(git config --local --get http.https://github.com/.extraheader)" - git submodule sync --recursive - git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + #- name: Checkout submodules + # shell: bash + # run: | + # git config --global url."https://github.com/".insteadOf "git@github.com:" + # auth_header="$(git config --local --get http.https://github.com/.extraheader)" + # git submodule sync --recursive + # git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + - name: Add nuget.exe + uses: nuget/setup-nuget@v1 + - name: restore Nuget Packages + run: nuget restore .\PepperDashEssentials.sln -MSBuildVersion 4 # Fetch all tags - name: Fetch tags run: git fetch --tags diff --git a/.gitignore b/.gitignore index 5ba628b2..47084fd0 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,7 @@ SIMPLSharpLogs/ *.projectinfo essentials-framework/EssentialDMTestConfig/ output/ +packages/ + PepperDashEssentials-0.0.0-buildType-test.zip diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj index 6c606273..7a0ac68d 100644 --- a/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials.csproj @@ -71,9 +71,9 @@ ..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll - + False - ..\essentials-framework\pepperdashcore-builds\PepperDash_Core.dll + ..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll False diff --git a/PepperDashEssentials/packages.config b/PepperDashEssentials/packages.config new file mode 100644 index 00000000..f1f7bd89 --- /dev/null +++ b/PepperDashEssentials/packages.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj index 55a157b4..c43222d9 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj @@ -83,9 +83,9 @@ ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll - + False - ..\..\pepperdashcore-builds\PepperDash_Core.dll + ..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll False diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/packages.config b/essentials-framework/Essentials Core/PepperDashEssentialsBase/packages.config new file mode 100644 index 00000000..f1f7bd89 --- /dev/null +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/packages.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj b/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj index 76aae649..76e510aa 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj +++ b/essentials-framework/Essentials DM/Essentials_DM/PepperDash_Essentials_DM.csproj @@ -59,9 +59,9 @@ ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll - + False - ..\..\pepperdashcore-builds\PepperDash_Core.dll + ..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll False diff --git a/essentials-framework/Essentials DM/Essentials_DM/packages.config b/essentials-framework/Essentials DM/Essentials_DM/packages.config new file mode 100644 index 00000000..f1f7bd89 --- /dev/null +++ b/essentials-framework/Essentials DM/Essentials_DM/packages.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj index ba12a129..b21872a1 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj @@ -63,9 +63,9 @@ ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll - + False - ..\..\pepperdashcore-builds\PepperDash_Core.dll + ..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll False diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/packages.config b/essentials-framework/Essentials Devices Common/Essentials Devices Common/packages.config new file mode 100644 index 00000000..f1f7bd89 --- /dev/null +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/packages.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/essentials-framework/Essentials/PepperDashEssentials/packages.config b/essentials-framework/Essentials/PepperDashEssentials/packages.config new file mode 100644 index 00000000..f1f7bd89 --- /dev/null +++ b/essentials-framework/Essentials/PepperDashEssentials/packages.config @@ -0,0 +1,3 @@ + + + \ No newline at end of file