Skip to content

Commit c184ea3

Browse files
chcgchcg
committed
updates for boost 1.79.0
1 parent 3b2d7cf commit c184ea3

File tree

7 files changed

+31
-20
lines changed

7 files changed

+31
-20
lines changed

‎.github/workflows/CI_build.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
matrix:
1212
build_configuration: [Release]
1313
build_platform: [Any CPU]
14-
build_boost_version: [1_72_0]
15-
build_boost_version_dot: [1.72.0]
14+
build_boost_version: [1_79_0]
15+
build_boost_version_dot: [1.79.0]
1616
build_msvc_version_dot: [14.2, 14.1]
1717
steps:
1818
- name: Checkout repo
@@ -40,12 +40,12 @@ jobs:
4040
working-directory: .
4141
run: |
4242
Set-Location -Path 'D:\a'
43-
New-Item -ItemType directory -Path D:\a\boost
44-
Set-Location -Path 'D:\a\boost'
45-
(New-Object System.Net.WebClient).DownloadFile("https://dl.bintray.com/boostorg/release/${{ matrix.build_boost_version_dot }}/binaries/boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe", "D:\a\boost\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe")
46-
(New-Object System.Net.WebClient).DownloadFile("https://dl.bintray.com/boostorg/release/${{ matrix.build_boost_version_dot }}/binaries/boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe", "D:\a\boost\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe")
47-
.\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe /SILENT /DIR=D:\a\boost\boost | Out-Null
48-
.\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe /SILENT /DIR=D:\a\boost\boost | Out-Null
43+
New-Item -ItemType directory -Path D:\a\boostorg
44+
Set-Location -Path 'D:\a\boostorg'
45+
(New-Object System.Net.WebClient).DownloadFile("https://boostorg.jfrog.io/artifactory/main/release/${{ matrix.build_boost_version_dot }}/binaries/boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe", "D:\a\boostorg\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe")
46+
(New-Object System.Net.WebClient).DownloadFile("https://boostorg.jfrog.io/artifactory/main/release/${{ matrix.build_boost_version_dot }}/binaries/boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe", "D:\a\boostorg\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe")
47+
.\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-64.exe /SILENT /DIR=D:\a\boostorg\boost | Out-Null
48+
.\boost_${{ matrix.build_boost_version }}-msvc-${{ matrix.build_msvc_version_dot }}-32.exe /SILENT /DIR=D:\a\boostorg\boost | Out-Null
4949
5050
- name: run builder
5151
working-directory: builder\builder\bin\Release\

‎appveyor.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
version: 1.78.{build}
1+
version: 1.79.{build}
22

33

44
environment:
55
matrix:
66

77
- PlatformToolset: v143
88
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
9-
BUILD_BOOST_VERSION: 1_78_0
10-
BUILD_BOOST_VERSION_DOT: 1.78.0
9+
BUILD_BOOST_VERSION: 1_79_0
10+
BUILD_BOOST_VERSION_DOT: 1.79.0
1111
BUILD_MSVC_VERSION_DOT: 14.2
1212

1313
configuration:

‎builder/builder/Config.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace builder
66
public static class Config
77
{
88
public static readonly Version Version =
9-
new StableVersion(1, 78, 0);
9+
new StableVersion(1, 79, 0);
1010

1111
public static readonly List[] Release =
1212
{
@@ -40,9 +40,9 @@ public CompilerInfo(string name, string preRelease = "")
4040
{ "vc110", new CompilerInfo("Visual Studio 2012 Update 4") },
4141
{ "vc120", new CompilerInfo("Visual Studio 2013 Update 5") },
4242
{ "vc140", new CompilerInfo("Visual Studio 2015 Update 3") },
43-
{ "vc141", new CompilerInfo("Visual Studio 2017 15.9.41") },
44-
{ "vc142", new CompilerInfo("Visual Studio 2019 16.11.7") },
45-
{ "vc143", new CompilerInfo("Visual Studio 2022 17.0.2") },
43+
{ "vc141", new CompilerInfo("Visual Studio 2017 15.9.45") },
44+
{ "vc142", new CompilerInfo("Visual Studio 2019 16.11.11") },
45+
{ "vc143", new CompilerInfo("Visual Studio 2022 17.1.1") },
4646
};
4747

4848
public static int CompilerNumber(string key)

‎builder/builder/Nuspec.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ private static void CreateNuspec(
6363
N("version", version.ToString()),
6464
N("authors", Config.Authors),
6565
N("owners", Config.Owners),
66-
N("licenseUrl", "https://github.com/sergey-shandar/getboost/blob/master/LICENSE"),
66+
N("license", Xml.A("type", "expression")),
67+
N("license", "BSL-1.0"),
6768
N("projectUrl", "https://github.com/sergey-shandar/getboost"),
6869
N("requireLicenseAcceptance", "false"),
6970
N("description", description),
@@ -85,7 +86,7 @@ private static void CreateNuspec(
8586
nuspec.CreateDocument().Save(nuspecFile);
8687
Process.Start(
8788
new ProcessStartInfo(
88-
@"..\..\..\packages\NuGet.CommandLine.6.0.0\tools\nuget.exe",
89+
@"..\..\..\packages\NuGet.CommandLine.6.1.0\tools\nuget.exe",
8990
"pack " + nuspecFile)
9091
{
9192
UseShellExecute = false,
@@ -95,14 +96,14 @@ private static void CreateNuspec(
9596
{
9697
var p = Process.Start(
9798
new ProcessStartInfo(
98-
@"..\..\..\packages\NuGet.CommandLine.6.0.0\tools\nuget.exe",
99+
@"..\..\..\packages\NuGet.CommandLine.6.1.0\tools\nuget.exe",
99100
"push " + nupkgFile + " -Source https://api.nuget.org/v3/index.json -ApiKey _")
100101
{
101102
UseShellExecute = false,
102103
});
103104
p.WaitForExit();
104105
if (p.ExitCode != 0) {
105-
Environment.Exit(p.ExitCode);
106+
//Environment.Exit(p.ExitCode);
106107
}
107108
}
108109
}

‎builder/builder/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Framework.G1" version="1.0.13.0" targetFramework="net45" userInstalled="true" />
4-
<package id="NuGet.CommandLine" version="6.0.0" targetFramework="net48" userInstalled="true" developmentDependency="true" />
4+
<package id="NuGet.CommandLine" version="6.1.0" targetFramework="net48" userInstalled="true" developmentDependency="true" />
55
</packages>

‎builder/builderTest/builderTest.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,16 @@
4040
<SpecificVersion>False</SpecificVersion>
4141
<HintPath>..\packages\Framework.G1.1.0.13.0\lib\portable-net45+sl50+win+wp80+MonoAndroid10+MonoTouch10\Framework.G1.dll</HintPath>
4242
</Reference>
43+
<Reference Include="Microsoft.Build.Utilities.v4.0" />
44+
<Reference Include="Microsoft.CSharp" />
4345
<Reference Include="System" />
46+
<Reference Include="System.ComponentModel.Composition" />
47+
<Reference Include="System.ComponentModel.Composition.Registration" />
48+
<Reference Include="System.ComponentModel.DataAnnotations" />
49+
<Reference Include="System.IO.Compression" />
50+
<Reference Include="System.Net.Http" />
51+
<Reference Include="System.Xml" />
52+
<Reference Include="System.Xml.Linq" />
4453
</ItemGroup>
4554
<Choose>
4655
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">

‎builder/builderTest/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Framework.G1" version="1.0.13.0" targetFramework="net451" />
4+
<package id="NuGet.CommandLine" version="5.11.0" targetFramework="net48" developmentDependency="true" />
45
</packages>

0 commit comments

Comments
 (0)