diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml index 8e923cc20de..6ae27896ed9 100644 --- a/.github/workflows/build-validation.yml +++ b/.github/workflows/build-validation.yml @@ -45,11 +45,6 @@ jobs: Invoke-WebRequest https://raw.githubusercontent.com/dotnet/install-scripts/master/src/dotnet-install.ps1 -OutFile dotnet-install.ps1 echo "Installing dotnet version ${{ env.DOTNET_INSTALLER_CHANNEL }}" .\dotnet-install.ps1 -InstallDir "c:\program files\dotnet" -Channel "${{ env.DOTNET_INSTALLER_CHANNEL }}" - - name: Setup .NET SDK 6 Preview - if: ${{ env.DOTNET_DO_INSTALL == 'true' }} - run: | - echo "Installing dotnet version ${{ env.DOTNET_INSTALLER_CHANNEL }}" - .\dotnet-install.ps1 -InstallDir "c:\program files\dotnet" -Version 6.0.100-alpha.1.20529.2 # Install locate projs global tool - name: Install LocateProjects tool @@ -75,6 +70,3 @@ jobs: - name: Report status run: | ./.github/workflows/dependencies/Out-GithubActionStatus.ps1 - - - diff --git a/.github/workflows/dependencies/Get-MSBuildResults.ps1 b/.github/workflows/dependencies/Get-MSBuildResults.ps1 index 6a96c7f6f2a..79ea1645f12 100644 --- a/.github/workflows/dependencies/Get-MSBuildResults.ps1 +++ b/.github/workflows/dependencies/Get-MSBuildResults.ps1 @@ -129,11 +129,16 @@ foreach ($item in $workingSet) { $data = $item.Split('|') + if ($data[1].Contains("mono-samples")){ + Write-Host "Found mono-sample project, Skipping." + $counter++ + Continue + } # Project found, build it - if ([int]$data[0] -eq 0) { + elseif ([int]$data[0] -eq 0) { $projectFile = Resolve-Path "$RepoRootDir\$($data[2])" $configFile = [System.IO.Path]::Combine([System.IO.Path]::GetDirectoryName($projectFile), "snippets.5000.json") - + # Create the default build command "dotnet build `"$projectFile`"" | Out-File ".\run.bat" diff --git a/.github/workflows/publish-mono-samples.yml b/.github/workflows/publish-mono-samples.yml new file mode 100644 index 00000000000..084e830d36e --- /dev/null +++ b/.github/workflows/publish-mono-samples.yml @@ -0,0 +1,38 @@ +name: Publish Mono Samples + +on: + pull_request: + paths: + - "core/mono-samples/**.c" + - "core/mono-samples/**.config" + - "core/mono-samples/**.cs" + - "core/mono-samples/**.csproj" + - "core/mono-samples/**.html" + - "core/mono-samples/**.java" + - "core/mono-samples/**.js" + - "core/mono-samples/**.m" + - "core/mono-samples/**.py" + - "core/mono-samples/**.txt" + branches: [ master ] + +env: + DOTNET_INSTALLER_CHANNEL: '6.0.100-alpha.1.20531.2' + DOTNET_DO_INSTALL: 'true' + +jobs: + build-mono: + runs-on: macos-latest + steps: + - uses: actions/checkout@a81bbbf8298c0fa03ea29cdc473d45769f953675 #@v2 + - name: Setup .NET SDK 6 + if: ${{ env.DOTNET_DO_INSTALL == 'true' }} + run: | + echo "Downloading dotnet-install.sh" + curl https://raw.githubusercontent.com/dotnet/install-scripts/master/src/dotnet-install.sh --output dotnet-install.sh + echo "Installing dotnet version ${{ env.DOTNET_INSTALLER_CHANNEL }}" + chmod +x ./dotnet-install.sh + ./dotnet-install.sh -InstallDir ~/.dotnet -Version ${{ env.DOTNET_INSTALLER_CHANNEL }} + - name: Publish mono iOS sample + run: | + cd ./core/mono-samples/iOS + dotnet publish /p:RunningOnCI=True \ No newline at end of file diff --git a/core/mono-samples/iOS/iOSSampleApp.csproj b/core/mono-samples/iOS/iOSSampleApp.csproj index 4116cd7f064..1e2b436894d 100644 --- a/core/mono-samples/iOS/iOSSampleApp.csproj +++ b/core/mono-samples/iOS/iOSSampleApp.csproj @@ -10,7 +10,7 @@ - + + +