Eric Erhardt
b64068291b
Remove OpenSUSE13 and Fedora23 since they are end of lifed.
2017-03-01 15:27:50 -06:00
Livar Cunha
94b79f4466
Updating the badge names that we use when checking if the build changed. Before, we were using an API to generate the OS names, now we are using msbuild OSName property, which names the OS differently.
2017-03-01 11:46:53 -08:00
Piotr Puszkiewicz
664f089985
Reduce chmod
2017-02-28 18:16:51 -08:00
Matt Ellis
779d26901d
Make update-dependencies idempotent in the only update case
...
Today, if you run update-dependencies --Update and there are no
changes that need to be made (for example, you ran it previously) and
there are pending changes (i.e. git status shows diffs) the program
crashes with an unhandled exception because some code in VersionTools
is upset that there are pending changes since it thinks there should
be none.
Re-structure the code such that we don't call the method that's going
to throw when we are just updating dependencies. This also means
devs (or the composed build) who want to run this more than once do
longer have to reset changes beforehand.
2017-02-28 11:33:37 -08:00
Justin Goshi
61c1e3e104
Remove duplicate properties
2017-02-27 11:06:44 -08:00
Eric Erhardt
ab887ec024
Merge remote-tracking branch 'upstream/rel/1.0.0' into rel101
2017-02-25 14:30:53 -06:00
Piotr Puszkiewicz
8fc6766785
Merge branch 'rel/1.0.1' into Merge100To101
2017-02-23 18:22:02 -08:00
Eric Erhardt
ace9526681
Merge remote-tracking branch 'refs/remotes/upstream/rel/1.0.0'
...
Conflicts:
README.md
build/Microsoft.DotNet.Cli.Monikers.props
test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
2017-02-23 15:42:35 -06:00
Eric Erhardt
5227896d0f
Fix Ubuntu16.10 BuildSdkDeb
...
We need to replace a string with string.Empty in the debian .json file. Fixing ReplaceFileContents to support this scenario.
2017-02-23 15:29:11 -06:00
Livar Cunha
7f4f35db65
Adding the SDK version to the hash of the lzma archive, since the SDK has implicit package refs in it that will impact the archive when they change.
2017-02-23 01:13:58 -08:00
Eric Erhardt
916a19c493
Add support for Fedora 24, OpenSUSE 42.1 and Ubuntu 16.10
2017-02-22 15:13:02 -06:00
Piotr Puszkiewicz
c5e7c3dd45
Merge pull request #5736 from dotnet/dev/jgoshi/morePropsRename
...
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
2017-02-22 09:15:20 -08:00
Mike Lorbetske
e145ca88e4
Placeholder for template update
2017-02-21 16:28:47 -08:00
Matt Ellis
921c116c65
Consume local info support from VersionTools
...
Davis added support for VersionTools to be able to pull from a local
filesystem layout that looks like what we have in GitHub on
dotnet/versions.
Start to consume this so a composed build can use this logic to update
dependencies using local version information produced during the build.
2017-02-21 16:56:00 -05:00
Justin Goshi
27a11e4eca
Merge branch 'master' into dev/jgoshi/morePropsRename
2017-02-21 10:00:30 -08:00
Piotr Puszkiewicz
85b2a129db
Merge branch 'rel/1.0.0'
...
Conflicts:
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj
TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj
build.proj
build/Compile.targets
build/Microsoft.DotNet.Cli.Compile.targets
build/Microsoft.DotNet.Cli.DependencyVersions.props
build/Microsoft.DotNet.Cli.Monikers.props
build/Microsoft.DotNet.Cli.Prepare.targets
build/package/Microsoft.DotNet.Cli.Nupkg.targets
build/package/Nupkg.targets
build/test/TestPackageProjects.targets
build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
build_projects/dotnet-cli-build/GetCommitCount.cs
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
build_projects/shared-build-targets-utils/Utils/BuildVersion.cs
src/dotnet-archive/dotnet-archive.csproj
src/tool_msbuild/tool_msbuild.csproj
src/tool_nuget/tool_nuget.csproj
test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
test/ArgumentsReflector/ArgumentsReflector.csproj
test/EndToEnd/EndToEnd.csproj
test/Microsoft.DotNet.Cli.Sln.Internal.Tests/Microsoft.DotNet.Cli.Sln.Internal.Tests.csproj
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.csproj
test/Microsoft.DotNet.Configurer.UnitTests/Microsoft.DotNet.Configurer.UnitTests.csproj
test/Microsoft.DotNet.ProjectJsonMigration.Tests/Microsoft.DotNet.ProjectJsonMigration.Tests.csproj
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
test/binding-redirects.Tests/binding-redirects.Tests.csproj
test/crossgen.Tests/crossgen.Tests.csproj
test/dotnet-add-package.Tests/dotnet-add-package.Tests.csproj
test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
test/dotnet-build.Tests/dotnet-build.Tests.csproj
test/dotnet-help.Tests/dotnet-help.Tests.csproj
test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
test/dotnet-msbuild.Tests/dotnet-msbuild.Tests.csproj
test/dotnet-new.Tests/dotnet-new.Tests.csproj
test/dotnet-nuget.UnitTests/dotnet-nuget.UnitTests.csproj
test/dotnet-pack.Tests/dotnet-pack.Tests.csproj
test/dotnet-publish.Tests/dotnet-publish.Tests.csproj
test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
test/dotnet-restore.Tests/dotnet-restore.Tests.csproj
test/dotnet-run.Tests/dotnet-run.Tests.csproj
test/dotnet-sln-add.Tests/dotnet-sln-add.Tests.csproj
test/dotnet-sln-list.Tests/dotnet-sln-list.Tests.csproj
test/dotnet-sln-remove.Tests/dotnet-sln-remove.Tests.csproj
test/dotnet-test.Tests/dotnet-test.Tests.csproj
test/dotnet-vstest.Tests/dotnet-vstest.Tests.csproj
test/dotnet.Tests/dotnet.Tests.csproj
test/msbuild.IntegrationTests/msbuild.IntegrationTests.csproj
tools/Archiver/Archiver.csproj
2017-02-17 02:00:05 -08:00
Livar Cunha
1c409befbe
Updating DependencyModel to 1.0.2
2017-02-17 00:29:17 -08:00
Livar Cunha
3eafd9de02
Updating Microsoft.DotNet.PlatformAbstractions version to 1.1.0.
2017-02-16 22:46:04 -08:00
Justin Goshi
8e58a247b0
Finish renaming props file to remove Microsoft.Dotnet.Cli prefix
2017-02-16 11:16:20 -08:00
Matt Ellis
47b75cfa12
Misc build changes
...
For injestion into a composed build, I'm adding some minor tweaks to
our build system:
- Teach DownloadFile task how to consume file:// URLs so we can pass
around artifacts using local sources.
- Add `SkipBuildingInstallers`, an MSBuild property that can be set
to true when installers (pkgs, msis, debs, rpms and the like) do
not need to be built.
- Add `IncludeAdditionalSharedFrameworks`, an MSBuild property that
can be set to prevent additional shared frameworks (i.e. shared
frameworks that the CLI does not use at runtime) from being
downloaded and included in our payload.
- Add `IncludeNuGetPackageArchive` an MSBuild property that can be
set to prevent the lzma archive containing all the nupkgs we
restore on first run from being included in the final output.
- Provide a way to change the Uri use for blob storage (so the
composed build and point at a local folder that looks like blob
storage to pick up artifacts from).
2017-02-15 16:52:46 -08:00
Matt Ellis
5d932c6aba
Get update-dependenices working again
...
- Fix build issues due to .props file not existing on a clean
enlistment
- Fix path separator issues on *NIX
- Add update-dependencies.sh
- Support -Update in update-dependencies.ps1
2017-02-13 17:30:33 -08:00
Livar
6ef4bdf4e2
Merge branch 'rel/1.0.0' into new_shared_framework_versions
2017-02-13 13:44:57 -08:00
Livar Cunha
1d61bf97ed
Updated the Shared Framework to 1.1.1 and 1.0.4.
2017-02-10 23:05:16 -08:00
Justin Goshi
483e6bd9c1
Address PR comments
2017-02-10 14:13:44 -08:00
Justin Goshi
64ccab43e8
Merge branch 'master' into dev/jgoshi/refactorTasks
2017-02-10 13:38:07 -08:00
Justin Goshi
33d83d6639
Refactor tasks
2017-02-10 12:13:44 -08:00
Eric Erhardt
31ff72e62d
Respond to PR feedback.
2017-02-10 11:53:27 -06:00
Eric Erhardt
1e20550f5d
Upgrade update-dependencies script.
...
- Take the latest VersionTools, so we can take advantage of new features.
- Update what files need to be updated - DependencyVersions.props.
- Clean up the powershell script.
2017-02-09 16:56:19 -06:00
Eric Erhardt
454dd10f8d
Update dotnet new to use the new 2.0 templates.
2017-02-09 10:18:39 -06:00
Livar Cunha
35fc8c1d0e
Step one of introducing a flag to drop the suffix out of our build versions.
2017-02-08 15:26:47 -08:00
Eric Erhardt
56d391caad
Fix up the merge so it gets past Prepare and Compile.
2017-02-08 12:26:04 -06:00
Piotr Puszkiewicz
b0a5d53ed5
Merge rel/1.0.0 to master
2017-02-06 12:43:57 -08:00
Eric Erhardt
a2c1a39d07
Fix projects and tests after merge of rel/1.0.0.
2017-02-01 18:35:52 -06:00
Eric Erhardt
9f0bb778a1
Merge rel/1.0.0 into master.
2017-02-01 14:32:59 -06:00
seancpeters
2d93968a88
New3 integration ( #5430 )
...
* Partial conversion to new3. 2 tests fail due to browserlink not restoring.
* new cache initialization
* More lzma changes, and removed a razor ref from templates
* Ephemeral hive flag added to tests that need it
* Updated the template engine version to build against. Minor code cleanup
* Config changes to make template versions separate from template engine versions
* Changed dotnet new versioning to use Product.Version
* Fixing Archiver.csproj
* Fixing dotnet new test.
* Fix LZMA Package Source Condition
* Workaround for newline differences.
* fixed tests with changed template parameters. Added a new3 template non-match test
2017-01-31 17:31:37 -08:00
Eric Erhardt
fd65cb03b6
Update dotnet new to generate a "2.0" project.
2017-01-29 09:46:46 -06:00
Piotr Puszkiewicz
ba69c88c79
Work around build test.sln
race condition until fixed ( #5490 )
...
* Remove GenerateRuntimeConfigurationFiles from this library
* Disable parallel build of test.sln
* PR feedback
2017-01-27 17:13:04 -08:00
Piotr Puszkiewicz
bbac129c04
Account for Windows slashes
2017-01-27 01:45:31 -08:00
Piotr Puszkiewicz
0ab87924b2
Add DOTNET_RUNTIME_ID to kept environment variables
2017-01-27 01:18:50 -08:00
Piotr Puszkiewicz
c4e928a18d
Cleanup
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
d70aeb950b
Success!
2017-01-27 00:46:09 -08:00
PiotrP
a473c2bad7
WiP
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
94e74d846a
WiP
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
c25abfb7c7
WiP
2017-01-27 00:46:09 -08:00
Piotr Puszkiewicz
19ed5a558b
WiP
2017-01-27 00:46:09 -08:00
Eric Erhardt
0073fc8534
Update CLI to run on netcoreapp1.1.
2017-01-26 14:48:39 -08:00
Eric Erhardt
f6b0196b0f
Turn off multi-proc building of the test .sln to work around "cannot access file becuase it is being used by another process" errors.
2017-01-26 07:29:00 -06:00
Livar
a442449c55
Updating the branding on rel/1.0.0 to rc4. ( #5267 )
2017-01-12 13:14:57 -08:00
PiotrP
9008aaff85
merge RC3 into rel/1.0.0
2017-01-11 13:03:09 -08:00
Eric Erhardt
82317c7a0a
Merge pull request #5257 from eerhardt/UpdateNuGet
...
Update NuGet to 4.0.0-rc3-2193 to bring in new TFMs for netstandard/netcoreapp 2.0
2017-01-11 10:45:45 -06:00
Eric Erhardt
c481ad9cdc
Merge all hard-coded versions and version suffixes to be defined in a single spot.
2017-01-10 20:54:11 -06:00
Livar Cunha
d3157de6ee
Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it.
2017-01-10 16:48:28 -06:00
Livar Cunha
e71c58c156
Fixing nuget API calls and fixing the nuget test package directory creation, so that nuget can restore using it.
2017-01-10 10:43:05 -08:00
Eric Erhardt
0f2c305dc1
Add NuGet version to DependencyVersions.props.
2017-01-10 10:48:37 -06:00
Eric Erhardt
5035320247
Add NuGet version to DependencyVersions.props.
2017-01-10 10:43:14 -06:00
Livar
f2f37729b8
Merge pull request #5235 from eerhardt/PopulateNuGetCache11
...
Populate nuget cache for shared fx and asp.net 1.1
2017-01-07 11:31:54 -08:00
Rohit Agrawal
5bbfbfeeed
update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5 ( #5214 )
...
* update nuget to 4.0.0-rc3 and sdk to 1.0.0-alpha-20170105-5
* Modifying restore project.json to use the project.json stage0 CLI instead of restore-projectjson command.
* add a nuget dependency so migrated project has packageref and generates an assets file on restore
2017-01-06 16:28:04 -08:00
Eric Erhardt
0cfc54c377
First time experience populating the NuGet cache with 1.1 packages.
2017-01-06 17:45:34 -06:00
Eric Erhardt
12f28a6019
Merge pull request #5225 from eerhardt/AddSharedFx11
...
Install Shared Framework 1.1 when installing the CLI
2017-01-06 11:21:14 -06:00
Livar
839bc2394e
Merge pull request #5228 from eerhardt/FixBuild
...
Fix official build break by referencing WindowsAzure.Storage 7.2.1 everywhere
2017-01-05 23:26:40 -08:00
Eric Erhardt
28ff7c51a1
Fix official build break by referencing WindowsAzure.Storage 7.2.1 in all build assemblies.
2017-01-05 23:37:15 -06:00
Livar Cunha
b41eb43883
Updating our projects and test assets to work with the latest SDK.
2017-01-05 19:44:52 -08:00
Eric Erhardt
e5e11c19c2
Download and extract shared framework 1.1. This initial change gets 1.1 into the archive installers. Still need to bring it into the native installers as well.
2017-01-05 15:03:56 -06:00
Krzysztof Wicher
dfb0a28224
Merge pull request #5180 from krwq/5070b
...
Remove some cross project compile includes on cs files
2017-01-05 12:13:54 -08:00
Livar Cunha
44ad9ec2c7
Removing -- separator from dotnet publish task. Dotnet publish nor any other command uses -- as a paramater separator for msbuild params.
2017-01-04 14:18:44 -08:00
Krzysztof Wicher
b813695fc0
remove cross project cs dependencies from dotnet-cli-build.csproj
2016-12-29 16:14:49 -08:00
Krzysztof Wicher
746d92337a
fix build errors and remove cross project cs dependency in update-dependencies.csproj
2016-12-29 15:57:18 -08:00
Justin Goshi
b72d625168
Include ASP packages in offline cache ( #5124 )
...
* Archive asp.net package references
* Archive asp.net package references
* Change the hash input so it's the same on all platforms
* Address PR comments
2016-12-27 11:28:24 -10:00
Livar Cunha
3b081316ad
Updating the SDK version in the BundleSdks.props and adding dirs.props back to all csprojs but the TestAssets ones.
2016-12-20 16:38:04 -08:00
Livar Cunha
fadacc0aac
Updating the projects files in the repo to use the SDK attribute.
2016-12-20 15:52:50 -08:00
Zlatko Knezevic
7a2c6ad086
Quote temp path output and input in crossgen ( #5089 )
...
Fixes #5088
2016-12-20 11:36:48 -08:00
Arun Mahapatra
8a6f67a84b
Fix no build option in dotnet test task
2016-12-16 20:42:57 +05:30
Nick Guerrera
9cf2d74c8b
Work around msbuild bug that blocks git tool tasks in VS2017 prompt
2016-12-13 16:12:01 -08:00
Piotr Puszkiewicz
d2d0353e60
Include Microsoft.Net.Sdk in CLI layout ( #4895 )
...
* WiP
* Update test
* Working version of Net SDK
* Latest SDK doesn't work as packageref
* DCR + PR
* Harden CLI tests against #4884
2016-12-03 14:19:54 -08:00
Rohit Agrawal
4311926366
update nuget to 4.0.0-rc2 (dev build 2067) ( #4904 )
2016-12-02 19:19:54 -08:00
Piotr Puszkiewicz
da82bdb05d
Centralize Microsoft.Net.SDK Version ( #4890 )
...
* Centralize Microsoft.Net.Sdk package version
Note: Templates were omitted as their version needs to be static.
* Unifying additional missmatched versions
* prefercliruntime
whitespace threw off ReplaceAll
* Additional missed globs
* Revert SDK version for performance tests
* PR Feedback
* Roll back VSTestXunitDesktopAndNetCore.csproj SDK version
2016-12-02 09:34:03 -08:00
Piotr Puszkiewicz
f18967e39a
Update CLI's MSBuild Version to 15.1.0-preview-000451-02 ( #4889 )
...
* Centralize definition of MSBuild Version in CLI
* MSBuild --> 15.1.0-preview-000451-02
2016-12-01 20:10:42 -08:00
Justin Goshi
be61afcfa5
Remove unused project.json and .xproj files ( #4735 )
...
* Remove unused project.json and .xproj files
* Update the test msi script
2016-11-15 16:12:19 -10:00
Justin Goshi
51562109ea
Migrate test packages ( #4720 )
...
* Migrate TestPackages
* Add check for desktop available
* Revert previous change
* WIP try something for non-Windows
* Another attempt to pack properly on non-windows
* Another attempt to fix pack errors
* Remove spaces
* Another attempt to make pack work cross-platform
2016-11-15 12:12:28 -10:00
Krzysztof Wicher
9212605e89
binding redirects tests: Simplify and get ready for enabling ( #4692 )
...
* binding redirects tests: Simplify and get ready for enabling
* fix targets broken during cleanup
* fix non-windows build
* apply pr feedback: remove some not needed code
* remigrate BindingRedirects samples, add x64 to bind redir proj
2016-11-14 14:26:03 -08:00
Justin Goshi
6d57ca7e14
Migrating all test projects ( #4668 )
...
* WIP migrate tests
* WIP fixing more tests
* WIP fix test build break
* Test results files are now trx
* Get CI to pass until we get an xunit xml logger
* Added DotNetTestPJ since that was needed for one test
* Fix build break
* Forgot to add DotNetTestPJ as a build task
* Need to restore project.json for the project used in ubuntu test
* Restore PJ for ubuntu test
* Switch the Ubuntu test to csproj based
2016-11-11 21:46:29 -10:00
Piotr Puszkiewicz
b354e1a3c6
Eliminate imports from CLI, where possible ( #4673 )
...
* Remove imports from dotnet.dll
* Add back dotnet5.4 to dotnet.dll due to AppInsights
* dotnet-cli-build.csproj: OData
redist.csproj: AppInsights
2016-11-10 10:19:37 -08:00
Livar Cunha
de0ca4823f
Fixing how we clean the file when it fails to download. We were doing it inside the using statement, so it still had a lock to the file and failed to delete it.
2016-11-09 10:05:05 -08:00
Livar Cunha
087852b1b8
Changing the lzma generation to first trying to download it from blob. If that fails, generate it. And if we generate it and we are uploading things to azure, upload it as well.
2016-11-08 15:14:47 -08:00
Piotr Puszkiewicz
24596b23ae
02->2
2016-11-04 10:30:00 -07:00
Piotr Puszkiewicz
6e5527ba4c
Final Version Numbers
2016-11-04 10:09:22 -07:00
seancpeters
40c34f891a
Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions ( #4585 )
...
* Updating the Microsoft.Net.Sdk & Microsoft.Net.Sdk.Web versions
* Fixed merge conflicts. Had to re-update the Sdk version in one place.
* re-migrate dotnet.dll
* Revert Performance Test Projects
* Fix test test
* Add missing WithRuntime
* Disable failing test test
2016-11-03 22:12:33 -07:00
Rob Relyea
f961fef8e0
update NuGet in CLI to 4.0.0.2048 ( #4614 )
...
* update NuGet in CLI to 4.0.0.2047
* update NuGet in CLI to 4.0.0.2048
2016-11-03 22:11:44 -07:00
Piotr Puszkiewicz
fd9cb55f1a
Add msbuild-based stage0 where possible ( #4597 )
...
* Add msbuild-based stage0 where possible
* Fix bash initialization script
* Windows Fixes
* Fix dotnet deb tool
2016-11-02 23:01:57 -07:00
Livar Cunha
c2f60cede4
Updating the SDK to the latest.
2016-11-01 00:29:54 -07:00
Jeff Kluge
595a768e30
Custom logger for MSBuild to receive telemetry events ( #4551 )
...
* Upgrade MSBuild references to 15.1.0-preview-000370-00
* Custom logger for MSBuild to receive telemetry events
Had to make the telemetry session ID a static variable so that the forwarding app could use it.
I've tested this all manually and will be writing tests after everyone signs off on the implementation here.
2016-10-31 16:16:39 -07:00
Justin Goshi
a4776a2b2c
Migrate src and tools to csproj ( #4538 )
...
Thanks for getting this in!
2016-10-29 01:04:20 -07:00
Livar
3ec5279491
Merge pull request #4516 from dagood/disable-parallel
...
Use --disable-parallel during xplat restores
2016-10-29 00:49:09 -07:00
Justin Emgarten
54cad0b7a6
Updating nuget to 4.0.0-rc-2037
2016-10-28 17:13:29 -07:00
Davis Goodin
59a6c72be7
Use --disable-parallel during xplat restores.
...
Works around NuGet parallel restore timeouts becoming build failures when the machine has a slow connection, for example in our Docker Fedora containers.
2016-10-28 10:53:56 -05:00
Piotr Puszkiewicz
6fcbefa4f7
[WIP] Removes *3 verbs, making msbuild the driver ( #4456 )
...
Removes *3 verbs, making msbuild the driver
2016-10-27 18:46:43 -07:00
Eric Erhardt
33ec55aee3
Fix dotnet run3 --project to pass the project to msbuild.
...
Also update Microsoft.NET.Sdk to 1.0.0-alpha-20161026-2 since this has the corresponding fix needed for https://github.com/dotnet/sdk/issues/301 .
2016-10-26 00:04:40 -05:00
Livar Cunha
368d7a19af
Updating the SDK version to the latest.
2016-10-19 16:21:54 -07:00
Justin Goshi
a6d37d25f5
Clean up dotnet-cli-build.csproj ( #4416 )
...
Clean up dotnet-cli-build.csproj
2016-10-17 23:50:22 +00:00
Livar Cunha
391d04c67a
Adding net46 to some of our libraries back, so that we can run binding-redirect tests again. We need those tests for tool and we need to keep them running.
2016-10-16 18:44:07 -07:00