Skip to content

Commit c3c03f6

Browse files
DenifiaDenifia
authored
Merge pull request #26 from Denifia/develop
Develop
2 parents e995c0c + 10184d9 commit c3c03f6

File tree

112 files changed

+2773
-1954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+2773
-1954
lines changed

‎.gitignore‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ paket-files/
259259
# Python Tools for Visual Studio (PTVS)
260260
__pycache__/
261261
*.pyc
262-
/webapi/data.json
263-
/webapi/Properties/PublishProfiles/denifiastardewsendletters - Web Deploy.pubxml
264-
/webapi/data.message.json
262+
263+
# Custom
264+
*.pubxml
265+
*.db

‎.vscode/launch.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": ".NET Core Launch (web)",
6+
"type": "coreclr",
7+
"request": "launch",
8+
"preLaunchTask": "build",
9+
"program": "${workspaceRoot}/SendItems/WebApi/bin/Debug/netcoreapp1.1/Denifia.Stardew.SendItems.Api.dll",
10+
"args": [],
11+
"cwd": "${workspaceRoot}/SendItems/WebApi",
12+
"stopAtEntry": false,
13+
"internalConsoleOptions": "openOnSessionStart",
14+
"launchBrowser": {
15+
"enabled": true,
16+
"args": "${auto-detect-url}",
17+
"windows": {
18+
"command": "cmd.exe",
19+
"args": "/C start ${auto-detect-url}"
20+
},
21+
"osx": {
22+
"command": "open"
23+
},
24+
"linux": {
25+
"command": "xdg-open"
26+
}
27+
},
28+
"env": {
29+
"ASPNETCORE_ENVIRONMENT": "Development"
30+
},
31+
"sourceFileMap": {
32+
"/Views": "${workspaceRoot}/Views"
33+
}
34+
},
35+
{
36+
"name": ".NET Core Attach",
37+
"type": "coreclr",
38+
"request": "attach",
39+
"processId": "${command:pickProcess}"
40+
}
41+
]
42+
}

‎.vscode/tasks.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "0.1.0",
3+
"command": "dotnet",
4+
"isShellCommand": true,
5+
"args": [],
6+
"tasks": [
7+
{
8+
"taskName": "build",
9+
"args": [
10+
"${workspaceRoot}/SendItems/WebApi/SendItems.Api.csproj"
11+
],
12+
"isBuildCommand": true,
13+
"problemMatcher": "$msCompile"
14+
}
15+
]
16+
}

‎BuyRecipes/BuyRecipes.csproj‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{7DACA8E6-D69F-43BB-8442-CDB25F7C863B}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>BuyRecipes</RootNamespace>
11+
<AssemblyName>BuyRecipes</AssemblyName>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug\</OutputPath>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
</PropertyGroup>
24+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25+
<DebugType>pdbonly</DebugType>
26+
<Optimize>true</Optimize>
27+
<OutputPath>bin\Release\</OutputPath>
28+
<DefineConstants>TRACE</DefineConstants>
29+
<ErrorReport>prompt</ErrorReport>
30+
<WarningLevel>4</WarningLevel>
31+
</PropertyGroup>
32+
<ItemGroup>
33+
<Reference Include="System" />
34+
<Reference Include="System.Core" />
35+
<Reference Include="System.Xml.Linq" />
36+
<Reference Include="System.Data.DataSetExtensions" />
37+
<Reference Include="Microsoft.CSharp" />
38+
<Reference Include="System.Data" />
39+
<Reference Include="System.Net.Http" />
40+
<Reference Include="System.Xml" />
41+
</ItemGroup>
42+
<ItemGroup>
43+
<Compile Include="Properties\AssemblyInfo.cs" />
44+
</ItemGroup>
45+
<ItemGroup>
46+
<None Include="manifest.json">
47+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
48+
</None>
49+
<None Include="readme.md" />
50+
<None Include="release-notes.md" />
51+
</ItemGroup>
52+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
53+
</Project>

‎sendletters/Properties/AssemblyInfo.cs‎ renamed to ‎BuyRecipes/Properties/AssemblyInfo.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("Send Letters")]
9-
[assembly: AssemblyDescription("Mod for Stardew Valley")]
8+
[assembly: AssemblyTitle("BuyRecipes")]
9+
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("Send Letters")]
12+
[assembly: AssemblyProduct("BuyRecipes")]
1313
[assembly: AssemblyCopyright("Copyright © 2017")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
@@ -20,7 +20,7 @@
2020
[assembly: ComVisible(false)]
2121

2222
// The following GUID is for the ID of the typelib if this project is exposed to COM
23-
[assembly: Guid("d74fb037-cc7c-4047-8384-2c2e37999a7a")]
23+
[assembly: Guid("7daca8e6-d69f-43bb-8442-cdb25f7c863b")]
2424

2525
// Version information for an assembly consists of the following four values:
2626
//
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.1.2.0")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
3636
[assembly: AssemblyFileVersion("1.0.0.0")]

‎BuyRecipes/manifest.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"Name": "Buy Recipes",
3+
"Author": "Denifia",
4+
"Version": {
5+
"MajorVersion": 0,
6+
"MinorVersion": 1,
7+
"PatchVersion": 0,
8+
"Build": null
9+
},
10+
"MinimumApiVersion": "1.10",
11+
"Description": "Purchase recipes you don't know from a magazine rack in Pierre's shop",
12+
"UniqueID": "Denifia.BuyRecipes",
13+
"EntryDll": "Denifia.Stardew.BuyRecipes.dll"
14+
}

‎BuyRecipes/readme.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
**Buy Recipes** is a [Stardew Valley](http://stardewvalley.net/) mod which lets you
2+
purchase recipes you don't know from a magazine rack in Pierre's shop.
3+
4+
**Under development!**
5+
6+
## Contents
7+
* [Versions](#versions)
8+
* [See also](#see-also)
9+
10+
## Versions
11+
See [release notes](release-notes.md).
12+
13+
## See also
14+
* [My other mods](../readme.md)

‎BuyRecipes/release-notes.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[← back to readme](readme.md)
2+
3+
# Release notes
4+
## 0.1.0

‎denifia.stardew.sln‎ renamed to ‎Denifia.Stardew.sln‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26228.10
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendLetters", "sendletters\SendLetters.csproj", "{D74FB037-CC7C-4047-8384-2C2E37999A7A}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendItems", "SendItems\SendItems.csproj", "{D74FB037-CC7C-4047-8384-2C2E37999A7A}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SendLetters.Api", "webapi\SendLetters.Api.csproj", "{526E9ED5-0D1E-4226-8370-888460AD5CBF}"
9-
EndProject
10-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SendLetters.Common", "common\SendLetters.Common.shproj", "{E7F132C9-39B8-4344-B8AA-4B35829BEDF1}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SendItemsApi", "SendItemsApi\SendItemsApi.csproj", "{526E9ED5-0D1E-4226-8370-888460AD5CBF}"
119
EndProject
1210
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".metadata", ".metadata", "{7D99962B-F613-4157-81BB-F8AA3F54B065}"
1311
ProjectSection(SolutionItems) = preProject
@@ -18,15 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".metadata", ".metadata", "{
1816
readme.md = readme.md
1917
EndProjectSection
2018
EndProject
21-
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Pathoschild.Stardew.Common", "Pathoschild.Stardew.Common\Pathoschild.Stardew.Common.shproj", "{EB97DAD7-6B56-40B9-8622-E1A795589D5F}"
19+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuyRecipes", "BuyRecipes\BuyRecipes.csproj", "{7DACA8E6-D69F-43BB-8442-CDB25F7C863B}"
2220
EndProject
2321
Global
24-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
25-
common\denifia.stardew.sendletters.common.projitems*{d74fb037-cc7c-4047-8384-2c2e37999a7a}*SharedItemsImports = 4
26-
Pathoschild.Stardew.Common\Pathoschild.Stardew.Common.projitems*{d74fb037-cc7c-4047-8384-2c2e37999a7a}*SharedItemsImports = 4
27-
common\denifia.stardew.sendletters.common.projitems*{e7f132c9-39b8-4344-b8aa-4b35829bedf1}*SharedItemsImports = 13
28-
Pathoschild.Stardew.Common\Pathoschild.Stardew.Common.projitems*{eb97dad7-6b56-40b9-8622-e1a795589d5f}*SharedItemsImports = 13
29-
EndGlobalSection
3022
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3123
Debug|Any CPU = Debug|Any CPU
3224
Release|Any CPU = Release|Any CPU
@@ -40,6 +32,10 @@ Global
4032
{526E9ED5-0D1E-4226-8370-888460AD5CBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
4133
{526E9ED5-0D1E-4226-8370-888460AD5CBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
4234
{526E9ED5-0D1E-4226-8370-888460AD5CBF}.Release|Any CPU.Build.0 = Release|Any CPU
35+
{7DACA8E6-D69F-43BB-8442-CDB25F7C863B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36+
{7DACA8E6-D69F-43BB-8442-CDB25F7C863B}.Debug|Any CPU.Build.0 = Debug|Any CPU
37+
{7DACA8E6-D69F-43BB-8442-CDB25F7C863B}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{7DACA8E6-D69F-43BB-8442-CDB25F7C863B}.Release|Any CPU.Build.0 = Release|Any CPU
4339
EndGlobalSection
4440
GlobalSection(SolutionProperties) = preSolution
4541
HideSolutionNode = FALSE

‎Pathoschild.Stardew.Common/CommonConstants.cs‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)