Skip to content

Commit d6f983a

Browse files
committed
[infra] try to Ubuntu and MacOs run.
1 parent 1cee8d8 commit d6f983a

File tree

6 files changed

+18
-29
lines changed

6 files changed

+18
-29
lines changed

Build/Nuke/NukeBuild.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Nuke.Common" Version="0.24.8" />
12+
<PackageReference Include="Nuke.Common" Version="0.24.9" />
1313
<PackageDownload Include="GitVersion.Tool" Version="[5.1.1]" />
1414
</ItemGroup>
1515

StructLinq.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{C7B0
2626
EndProject
2727
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Nuke", "Nuke", "{8A638E83-2D0E-49BB-AE31-7207F54336E7}"
2828
EndProject
29-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NukeBuild", "Build\Nuke\NukeBuild.csproj", "{AC4A0A45-540D-4EE4-B01F-55702BA310E2}"
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NukeBuild", "Build\Nuke\NukeBuild.csproj", "{486A956C-407B-410A-97C2-59D00DDEAE21}"
3030
EndProject
3131
Global
3232
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -46,8 +46,8 @@ Global
4646
{363DB35F-7108-4DE4-AE6C-62950E53D84E}.Debug|Any CPU.Build.0 = Debug|Any CPU
4747
{363DB35F-7108-4DE4-AE6C-62950E53D84E}.Release|Any CPU.ActiveCfg = Release|Any CPU
4848
{363DB35F-7108-4DE4-AE6C-62950E53D84E}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{AC4A0A45-540D-4EE4-B01F-55702BA310E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{AC4A0A45-540D-4EE4-B01F-55702BA310E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{486A956C-407B-410A-97C2-59D00DDEAE21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{486A956C-407B-410A-97C2-59D00DDEAE21}.Release|Any CPU.ActiveCfg = Release|Any CPU
5151
EndGlobalSection
5252
GlobalSection(SolutionProperties) = preSolution
5353
HideSolutionNode = FALSE
@@ -56,7 +56,7 @@ Global
5656
{9272A85F-FC64-4560-A88E-5362A37DA58E} = {2987C571-432E-4640-8D24-A3F8C9341276}
5757
{C7B0C282-3057-4C71-9E89-6FF7B5609AA0} = {2987C571-432E-4640-8D24-A3F8C9341276}
5858
{8A638E83-2D0E-49BB-AE31-7207F54336E7} = {2987C571-432E-4640-8D24-A3F8C9341276}
59-
{AC4A0A45-540D-4EE4-B01F-55702BA310E2} = {8A638E83-2D0E-49BB-AE31-7207F54336E7}
59+
{486A956C-407B-410A-97C2-59D00DDEAE21} = {8A638E83-2D0E-49BB-AE31-7207F54336E7}
6060
EndGlobalSection
6161
GlobalSection(ExtensibilityGlobals) = postSolution
6262
SolutionGuid = {784B203D-5E08-4ABF-A436-EE9F11F80E40}

build.cmd

100644100755
File mode changed.

build.ps1

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
1414
###########################################################################
1515

1616
$BuildProjectFile = "$PSScriptRoot\Build\Nuke\NukeBuild.csproj"
17-
$TempDirectory = "$PSScriptRoot\.tmp"
17+
$TempDirectory = "$PSScriptRoot\\.tmp"
1818

19-
$DotNetGlobalFile = "$PSScriptRoot\global.json"
19+
$DotNetGlobalFile = "$PSScriptRoot\\global.json"
2020
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
2121
$DotNetChannel = "Current"
2222

2323
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
2424
$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
25-
$env:NUGET_XMLDOC_MODE = "skip"
2625

2726
###########################################################################
2827
# EXECUTION
@@ -33,14 +32,6 @@ function ExecSafe([scriptblock] $cmd) {
3332
if ($LASTEXITCODE) { exit $LASTEXITCODE }
3433
}
3534

36-
# Print environment variables
37-
Get-Item -Path Env:*
38-
39-
# Check if any dotnet is installed
40-
if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue)) {
41-
ExecSafe { & dotnet --info }
42-
}
43-
4435
# If global.json exists, load expected version
4536
if (Test-Path $DotNetGlobalFile) {
4637
$DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)
@@ -61,6 +52,7 @@ else {
6152
# Download install script
6253
$DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
6354
New-Item -ItemType Directory -Path $TempDirectory -Force | Out-Null
55+
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
6456
(New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)
6557

6658
# Install by channel or version

build.sh

100644100755
Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
99
# CONFIGURATION
1010
###########################################################################
1111

12-
BUILD_PROJECT_FILE="$SCRIPT_DIR/Build/nuke/NukeBuild.csproj"
13-
TEMP_DIRECTORY="$SCRIPT_DIR/.tmp"
12+
BUILD_PROJECT_FILE="$SCRIPT_DIR/Build/Nuke/NukeBuild.csproj"
13+
TEMP_DIRECTORY="$SCRIPT_DIR//.tmp"
1414

15-
DOTNET_GLOBAL_FILE="$SCRIPT_DIR/global.json"
15+
DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
1616
DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
1717
DOTNET_CHANNEL="Current"
1818

1919
export DOTNET_CLI_TELEMETRY_OPTOUT=1
2020
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
21-
export NUGET_XMLDOC_MODE="skip"
22-
# Workaround according to https://github.com/dotnet/sdk/issues/335#issuecomment-371444503
2321

2422
###########################################################################
2523
# EXECUTION
@@ -29,14 +27,6 @@ function FirstJsonValue {
2927
perl -nle 'print $1 if m{"'$1'": "([^"]+)",?}' <<< ${@:2}
3028
}
3129

32-
# Print environment variables
33-
set
34-
35-
# Check if any dotnet is installed
36-
if [[ -x "$(command -v dotnet)" ]]; then
37-
dotnet --info
38-
fi
39-
4030
# If global.json exists, load expected version
4131
if [[ -f "$DOTNET_GLOBAL_FILE" ]]; then
4232
DOTNET_VERSION=$(FirstJsonValue "version" $(cat "$DOTNET_GLOBAL_FILE"))

src/StructLinq/StructLinq.csproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
<TargetFrameworks>netstandard1.0</TargetFrameworks>
55
</PropertyGroup>
66

7+
<PropertyGroup Label="Nuget">
8+
<Description>Implementation in C# of LINQ concept with struct </Description>
9+
<PackageTags>C#;linq;struct;allocation free;fast</PackageTags>
10+
<Company />
11+
</PropertyGroup>
12+
13+
714
<ItemGroup>
815
<None Update="Max\MaxStructEnumerable.tt">
916
<Generator>TextTemplatingFileGenerator</Generator>

0 commit comments

Comments
 (0)